Changeset 16833 in vbox

Timestamp:

Feb 17, 2009 12:41:47 PM (16 years ago)

Author:

vboxsync

Message:

cbinding: Moved MOZ_UNICODE into the cbinding.h header.

Location:

trunk/src/VBox/Main/cbinding

Files:

• Makefile.kmk (modified) (4 diffs)
• cbinding.h (modified) (3 diffs)

trunk/src/VBox/Main/cbinding/Makefile.kmk

@@ -58 +58 @@
  DLLS.linux += VBoxXPCOMC
  VBoxXPCOMC_TEMPLATE = VBOXMAINDLL
- VBoxXPCOMC_DEFS = MOZ_UNICODE IN_VBOXXPCOMC
+ VBoxXPCOMC_DEFS = IN_VBOXXPCOMC
  VBoxXPCOMC_SOURCES = \
         VBoxXPCOMC.cpp
@@ -67 +67 @@
  LIBRARIES.linux += VBoxXPCOMCGlue
  VBoxXPCOMCGlue_TEMPLATE = VBOXMAINEXE
- VBoxXPCOMCGlue_DEFS = MOZ_UNICODE IN_VBOXXPCOMC
+ VBoxXPCOMCGlue_DEFS = IN_VBOXXPCOMC
  VBoxXPCOMCGlue_SOURCES = \
         VBoxXPCOMCGlue.c
@@ -77 +77 @@
   PROGRAMS.linux += tstXPCOMC
   tstXPCOMC_TEMPLATE = VBOXR3
-  tstXPCOMC_DEFS = MOZ_UNICODE
   tstXPCOMC_INCS = \
         $(VBOX_PATH_SDK)/bindings/xpcom/include \
@@ -93 +92 @@
   PROGRAMS.linux += tstXPCOMCDynLink
   tstXPCOMCDynLink_TEMPLATE = VBOXR3
-  tstXPCOMCDynLink_DEFS = MOZ_UNICODE
   tstXPCOMCDynLink_INCS = \
         $(VBOX_PATH_SDK)/bindings/xpcom/include \

trunk/src/VBox/Main/cbinding/cbinding.h

@@ -3 +3 @@
  * C binding for XPCOM.
  */
-
-#ifndef ___cbinding_h
-#define ___cbinding_h
 
 /*
@@ -22 +19 @@
  * additional information or have any questions.
  */
+
+#ifndef ___VBoxXPCOMC_cbinding_h
+#define ___VBoxXPCOMC_cbinding_h
+
+#ifndef MOZ_UNICODE
+# define MOZ_UNICODE
+#endif
 
 #ifdef __cplusplus
@@ -106 +110 @@
 #endif
 
-#endif /* !___cbinding_h */
+#endif /* !___VBoxXPCOMC_cbinding_h */