From 11e5437d791f86743ffd501d75417b4bbdfa6c15 Mon Sep 17 00:00:00 2001
From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Date: Tue, 4 May 2010 16:50:35 +0000
Subject: [PATCH] More XBOX cleanup, just use _WIN32 which is defined on both

git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@468 400ebc74-4327-4243-bc38-086b20814532
---
 librtmp/bytes.h    | 6 +++---
 librtmp/hashswf.c  | 4 ++--
 librtmp/rtmp.c     | 6 +++---
 librtmp/rtmp_sys.h | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/librtmp/bytes.h b/librtmp/bytes.h
index 62b9226..de412a2 100644
--- a/librtmp/bytes.h
+++ b/librtmp/bytes.h
@@ -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
diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c
index b32442d..9b53d26 100644
--- a/librtmp/hashswf.c
+++ b/librtmp/hashswf.c
@@ -464,7 +464,7 @@ RTMP_HashSWF(const char *url, unsigned int *size, unsigned char *hash,
   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 int *size, unsigned char *hash,
 #endif
 #define DIRSEP	"\\"
 
-#else /* !WIN32 */
+#else /* !_WIN32 */
   hpre.av_val = "";
   hpre.av_len = 0;
   home.av_val = getenv("HOME");
diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
index 76b36f1..3a9cc19 100644
--- a/librtmp/rtmp.c
+++ b/librtmp/rtmp.c
@@ -117,7 +117,7 @@ static void DecodeTEA(AVal *key, AVal *text);
 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"
diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h
index 2ba1449..602827c 100644
--- a/librtmp/rtmp_sys.h
+++ b/librtmp/rtmp_sys.h
@@ -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>
-- 
2.40.0