Bug 957002. Stop including prtypes.h for endian macros. r=jrmuizel
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Mon, 10 Feb 2014 18:45:43 -0500
changeset 168075 b5be94737a83ce805dcb6ca08773c391fb723bb7
parent 168074 058f4ed4d33b49465ab9cc83ab85a760ec3578e1
child 168076 952941bc168d7df5291f93e601cb14d552dcf913
push idunknown
push userunknown
push dateunknown
reviewersjrmuizel
bugs957002
milestone30.0a1
Bug 957002. Stop including prtypes.h for endian macros. r=jrmuizel We don't need these anymore.
config/autoconf.mk.in
config/emptyvars.mk.in
dom/events/test/test_bug432698.html
gfx/qcms/qcmstypes.h
--- a/gfx/qcms/qcmstypes.h
+++ b/gfx/qcms/qcmstypes.h
@@ -1,26 +1,11 @@
 #ifndef QCMS_TYPES_H
 #define QCMS_TYPES_H
 
-#ifdef MOZ_QCMS
-
-#include "prtypes.h"
-#include <stdint.h>
-
-/* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
-
-#if defined(_AIX)
-#include <sys/types.h>
-#elif defined(__OS2__)
-#include <stdlib.h>
-#endif
-
-#else // MOZ_QCMS
-
 #if BYTE_ORDER == LITTLE_ENDIAN
 #define IS_LITTLE_ENDIAN
 #elif BYTE_ORDER == BIG_ENDIAN
 #define IS_BIG_ENDIAN
 #endif
 
 /* all of the platforms that we use _MSC_VER on are little endian
  * so this is sufficient for now */
@@ -33,17 +18,17 @@
 #endif
 
 #if !defined(IS_LITTLE_ENDIAN) && !defined(IS_BIG_ENDIAN)
 #error Unknown endianess
 #endif
 
 #if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || defined (_sgi) || defined (__sun) || defined (sun) || defined (__digital__)
 #  include <inttypes.h>
-#elif defined (_MSC_VER)
+#elif defined (_MSC_VER) && _MSC_VER < 1600
 typedef __int8 int8_t;
 typedef unsigned __int8 uint8_t;
 typedef __int16 int16_t;
 typedef unsigned __int16 uint16_t;
 typedef __int32 int32_t;
 typedef unsigned __int32 uint32_t;
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
@@ -54,15 +39,13 @@ typedef unsigned long uintptr_t;
 #endif
 
 #elif defined (_AIX)
 #  include <sys/inttypes.h>
 #else
 #  include <stdint.h>
 #endif
 
-#endif
-
 typedef qcms_bool bool;
 #define true 1
 #define false 0
 
 #endif