Changeset 36567 in vbox for trunk

Timestamp:

Apr 5, 2011 6:24:42 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71002

Message:

ugly.

Location:

trunk

Files:

• include/VBox/dbus.h (modified) (3 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)

trunk/include/VBox/dbus.h

@@ -1 +1 @@
 /** @file
- *
- * Module to dynamically load libdbus and load all symbols
- * which are needed by VirtualBox.
+ * Module to dynamically load libdbus and load all symbols which are needed by
+ * VirtualBox.
  */
 
@@ -26 +25 @@
  */
 
-#ifndef ___VBox_DBus_h
-#define ___VBox_DBus_h
+#ifndef ___VBox_dbus_h
+#define ___VBox_dbus_h
 
 #include <iprt/types.h>
 #include <iprt/stdarg.h>
+
+#ifndef __cplusplus
+# error "This header requires C++ to avoid name clashes."
+#endif
 
 /** Types and defines from the dbus header files which we need.  These are
@@ -98 +101 @@
 } DBusHandlerResult;
 
-typedef DBusHandlerResult (*DBusHandleMessageFunction) (DBusConnection *,
+typedef DBusHandlerResult (* DBusHandleMessageFunction)(DBusConnection *,
                                                         DBusMessage *, void *);
-typedef void (*DBusFreeFunction) (void *);
+typedef void (* DBusFreeFunction) (void *);
 
 /* Declarations of the functions that we need from libdbus-1 */
 #define VBOX_DBUS_GENERATE_HEADER
-RT_C_DECLS_BEGIN
+
 #include <VBox/dbus-calls.h>
-RT_C_DECLS_END
+
 #undef VBOX_DBUS_GENERATE_HEADER
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -2248 +2248 @@
                                 -e '/^_Z[[:alpha:]]*[[:digit:]]\+RTC/d' \
                                 \
-                                -e '/^dbus/d' \
-                                -e '/^RTDBusLoadLib/d' \
+                                -e '/^_Z*[[:digit:]]\+dbus/d' \
+                                -e '/^_Z13RTDBusLoadLibv/d' \
                                 \
                                 -e '/^VBoxHost_/d'\