[rtmpdump] r468 - in trunk/librtmp: bytes.h hashswf.c rtmp.c rtmp_sys.h

[hyc]

Author: hyc
Date: Tue May  4 18:50:35 2010
New Revision: 468

Log:
More XBOX cleanup, just use _WIN32 which is defined on both

Modified:
   trunk/librtmp/bytes.h
   trunk/librtmp/hashswf.c
   trunk/librtmp/rtmp.c
   trunk/librtmp/rtmp_sys.h

Modified: trunk/librtmp/bytes.h
==============================================================================
--- trunk/librtmp/bytes.h	Mon May  3 15:53:12 2010	(r467)
+++ trunk/librtmp/bytes.h	Tue May  4 18:50:35 2010	(r468)
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#if defined(WIN32) || defined(_XBOX)
+#ifdef _WIN32
 /* Windows is little endian only */
 #define __LITTLE_ENDIAN 1234
 #define __BIG_ENDIAN    4321
@@ -36,7 +36,7 @@
 
 typedef unsigned char uint8_t;
 
-#else /* !WIN32 */
+#else /* !_WIN32 */
 
 #include <sys/param.h>
 
@@ -52,7 +52,7 @@ typedef unsigned char uint8_t;
 #define __LITTLE_ENDIAN	LITTLE_ENDIAN
 #endif
 
-#endif /* !WIN32 */
+#endif /* !_WIN32 */
 
 /* define default endianness */
 #ifndef __LITTLE_ENDIAN

Modified: trunk/librtmp/hashswf.c
==============================================================================
--- trunk/librtmp/hashswf.c	Mon May  3 15:53:12 2010	(r467)
+++ trunk/librtmp/hashswf.c	Tue May  4 18:50:35 2010	(r468)
@@ -464,7 +464,7 @@ RTMP_HashSWF(const char *url, unsigned i
   AVal home, hpre;
 
   date[0] = '\0';
-#if defined(WIN32) || defined(_XBOX)
+#ifdef _WIN32
 #ifdef _XBOX
   hpre.av_val = "Q:";
   hpre.av_len = 2;
@@ -476,7 +476,7 @@ RTMP_HashSWF(const char *url, unsigned i
 #endif
 #define DIRSEP	"\\"
 
-#else /* !WIN32 */
+#else /* !_WIN32 */
   hpre.av_val = "";
   hpre.av_len = 0;
   home.av_val = getenv("HOME");

Modified: trunk/librtmp/rtmp.c
==============================================================================
--- trunk/librtmp/rtmp.c	Mon May  3 15:53:12 2010	(r467)
+++ trunk/librtmp/rtmp.c	Tue May  4 18:50:35 2010	(r468)
@@ -117,7 +117,7 @@ static void DecodeTEA(AVal *key, AVal *t
 static int HTTP_Post(RTMP *r, RTMPTCmd cmd, const char *buf, int len);
 static int HTTP_read(RTMP *r, int fill);
 
-#ifndef WIN32
+#ifndef _WIN32
 static int clk_tck;
 #endif
 
@@ -130,7 +130,7 @@ RTMP_GetTime()
 {
 #ifdef _DEBUG
   return 0;
-#elif defined(WIN32)
+#elif defined(_WIN32)
   return timeGetTime();
 #else
   struct tms t;
@@ -290,7 +290,7 @@ RTMP_UpdateBufferMS(RTMP *r)
 }
 
 #undef OSS
-#ifdef WIN32
+#ifdef _WIN32
 #define OSS	"WIN"
 #elif defined(__sun__)
 #define OSS	"SOL"

Modified: trunk/librtmp/rtmp_sys.h
==============================================================================
--- trunk/librtmp/rtmp_sys.h	Mon May  3 15:53:12 2010	(r467)
+++ trunk/librtmp/rtmp_sys.h	Tue May  4 18:50:35 2010	(r468)
@@ -21,7 +21,7 @@
  *  http://www.gnu.org/copyleft/lgpl.html
  */
 
-#if defined(WIN32) || defined(_XBOX)
+#ifdef _WIN32
 
 #ifdef _XBOX
 #include <xtl.h>
@@ -42,7 +42,7 @@
 #define sleep(n)	Sleep(n*1000)
 #define msleep(n)	Sleep(n)
 #define SET_RCVTIMEO(tv,s)	int tv = s*1000
-#else /* !WIN32 && !_XBOX */
+#else /* !_WIN32 */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/times.h>