[openwince-cvs-commit] include/stdint stdint-hwbench.h,1.1,1.2 stdint-win32.h,1.1,1.2

[Marcel T. <te...@us...>]

Update of /cvsroot/openwince/include/stdint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29816/stdint

Modified Files:
	stdint-hwbench.h stdint-win32.h 
Log Message:
2005-07-15  Marcel Telka  <ma...@te...>

	* stdint/stdint-hwbench.h: Changed comments. Disabled macros for C++ via
		__STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS.
	* stdint/stdint-win32.h: Disabled macros for C++ via __STDC_LIMIT_MACROS
		and __STDC_CONSTANT_MACROS.


Index: stdint-win32.h
===================================================================
RCS file: /cvsroot/openwince/include/stdint/stdint-win32.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- stdint-win32.h	27 Jun 2005 15:45:06 -0000	1.1
+++ stdint-win32.h	15 Jul 2005 07:50:16 -0000	1.2
@@ -86,6 +86,8 @@
 typedef INT64 intmax_t;
 typedef UINT64 uintmax_t;
 
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
+
 /*
  * Limits of Specified-Width Integer Types
  */
@@ -180,6 +182,10 @@
 #define	WINT_MIN		WCHAR_MIN
 #define	WINT_MAX		WCHAR_MAX
 
+#endif /* __STDC_LIMIT_MACROS */
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
+
 /*
  * Macros for Integer Constant Expressions
  */
@@ -201,4 +207,6 @@
 #define	INTMAX_C(value)		INT64_C(value)
 #define	UINTMAX_C(value)	UINT64_C(value)
 
+#endif /* __STDC_CONSTANT_MACROS */
+
 #endif /* STDINT_H */

Index: stdint-hwbench.h
===================================================================
RCS file: /cvsroot/openwince/include/stdint/stdint-hwbench.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- stdint-hwbench.h	27 Jun 2005 22:24:30 -0000	1.1
+++ stdint-hwbench.h	15 Jul 2005 07:50:16 -0000	1.2
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * stdint.h - integer types for Hitachi Workbench
+ * stdint.h - integer types for Hitachi Workbench/IAR Compiler
  * Copyright (C) 2005 Elcom s.r.o.
  * All rights reserved.
  *
@@ -82,6 +82,8 @@
 typedef long intmax_t;
 typedef unsigned long uintmax_t;
 
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
+
 /*
  * Limits of Specified-Width Interger Types
  */
@@ -151,7 +153,7 @@
 
 /* Limits of sig_atomic_t */
 
-/* N/A for Hitachi Workbench */
+/* N/A for Hitachi Workbench/IAR Compiler */
 
 /* Limit of size_t */
 
@@ -164,7 +166,11 @@
 
 /* Limits of wint_t */
 
-/* wint_t not supported in Hitachi Workbench */
+/* wint_t not supported in Hitachi Workbench/IAR Compiler */
+
+#endif /* __STDC_LIMIT_MACROS */
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
 
 /*
  * Macros for Integer Constant Expressions
@@ -185,4 +191,6 @@
 #define INTMAX_C(value)         INT32_C(value)
 #define UINTMAX_C(value)        UINT32_C(value)
 
+#endif /* __STDC_CONSTANT_MACROS */
+
 #endif /* STDINT_H */