Changeset 9332 in vbox

Timestamp:

Jun 2, 2008 11:10:25 PM (16 years ago)

Author:

vboxsync

Message:

Must make sure UINT32_C() and friends are defined when stdint.h might be included by someone other than iprt/types.h.

Location:

trunk

Files:

trunk/include/VBox/com/Guid.h

-              r8155
+              r9332
 #ifndef ___VBox_com_Guid_h
 #define ___VBox_com_Guid_h
+/* Make sure all the stdint.h macros are included - must come first! */
+#ifndef __STDC_LIMIT_MACROS
+# define __STDC_LIMIT_MACROS
+#endif
+#ifndef __STDC_CONSTANT_MACROS
+# define __STDC_CONSTANT_MACROS
+#endif
 #if defined (VBOX_WITH_XPCOM)

-              r8266
+              r9332
 #ifndef ___VBox_com_defs_h
 #define ___VBox_com_defs_h
+/* Make sure all the stdint.h macros are included - must come first! */
+#ifndef __STDC_LIMIT_MACROS
+# define __STDC_LIMIT_MACROS
+#endif
+#ifndef __STDC_CONSTANT_MACROS
+# define __STDC_CONSTANT_MACROS
+#endif
 #if defined (RT_OS_OS2)
 …
 #if defined (RT_OS_DARWIN) || (defined (QT_VERSION) && (QT_VERSION >= 0x040000))
   /* CFBase.h defines these &
+  /* CFBase.h defines these &
    * qglobal.h from Qt4 defines these */
 # undef FALSE

-              r8155
+              r9332
 #define ___VBox_com_ptr_h
+/* Make sure all the stdint.h macros are included - must come first! */
+#ifndef __STDC_LIMIT_MACROS
+# define __STDC_LIMIT_MACROS
+#endif
+#ifndef __STDC_CONSTANT_MACROS
+# define __STDC_CONSTANT_MACROS
+#endif
 #if !defined (VBOX_WITH_XPCOM)
 …
 #ifndef _ATL_IIDOF
 # define _ATL_IIDOF(c) __uuidof(c)
 #endif
+#endif
 #else /* !defined (VBOX_WITH_XPCOM) */
 …
 /**
  *  Returns @c true if two interface pointers are equal.
+ *
+ *
  *  According to the COM Identity Rule, interface pointers are considered to be
  *  equal if and only if IUnknown pointers queried on these interfaces pointers
  *  are equal (e.g. have the same binary value). Equal interface pointers
  *  represent the same object even if they are pointers to different interfaces.
+ *
+ *
  *  @param I1   Class of the first interface pointer (must be derived from
  *              IUnknown).
 …
+}
 /**
+/**
  *  Base template for smart COM pointers. Not intended to be used directly.
  */

-              r8155
+              r9332
 #define ___VBox_com_string_h
+/* Make sure all the stdint.h macros are included - must come first! */
+#ifndef __STDC_LIMIT_MACROS
+# define __STDC_LIMIT_MACROS
+#endif
+#ifndef __STDC_CONSTANT_MACROS
+# define __STDC_CONSTANT_MACROS
+#endif
 #if defined (VBOX_WITH_XPCOM)
 #include <nsMemory.h>
+# include <nsMemory.h>
 #endif

-              r8744
+              r9332
  * additional information or have any questions.
  */
+/* Make sure all the stdint.h macros are included - must come first! */
+#ifndef __STDC_LIMIT_MACROS
+# define __STDC_LIMIT_MACROS
+#endif
+#ifndef __STDC_CONSTANT_MACROS
+# define __STDC_CONSTANT_MACROS
+#endif
 #if defined(RT_OS_WINDOWS)

-              r8768
+              r9332
  * additional information or have any questions.
  */
+/* Make sure all the stdint.h macros are included - must come first! */
+#ifndef __STDC_LIMIT_MACROS
+# define __STDC_LIMIT_MACROS
+#endif
+#ifndef __STDC_CONSTANT_MACROS
+# define __STDC_CONSTANT_MACROS
+#endif
 #include <nsIGenericFactory.h>
 …
 /**
+/**
  *  Component definition table.
  *  Lists all components defined in this module.

-              r8768
+              r9332
  * additional information or have any questions.
  */
+/* Make sure all the stdint.h macros are included - must come first! */
+#ifndef __STDC_LIMIT_MACROS
+# define __STDC_LIMIT_MACROS
+#endif
+#ifndef __STDC_CONSTANT_MACROS
+# define __STDC_CONSTANT_MACROS
+#endif
 #include <ipcIService.h>

Note: See TracChangeset for help on using the changeset viewer.