From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Mon, 22 Mar 2010 09:55:30 +0000 (+0100)
Subject: Additional fixes for 2154acb3492d5ba19da36562e8409016da9cb79b
X-Git-Tag: dbus-1.3.1~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e183399391bb1740c2013b44b89c05cbad3796ea;p=thirdparty%2Fdbus.git

Additional fixes for 2154acb3492d5ba19da36562e8409016da9cb79b
---

diff --git a/cmake/dbus/dbus-1.def.cmake b/cmake/dbus/dbus-1.def.cmake
deleted file mode 100644
index 0979b7a86..000000000
--- a/cmake/dbus/dbus-1.def.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-@DBUS_LIBRARY_HEADER@
-EXPORTS
-@DBUS_CLIENT_EXPORTS@
-@DBUS_CLIENT_TEST_EXPORTS@
-@DBUS_VERBOSE_EXPORTS@
\ No newline at end of file
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 2b9b562ca..61fd8182e 100644
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -52,21 +52,6 @@ void _dbus_warn_check_failed  (const char *format,
 #define _DBUS_FUNCTION_NAME "unknown function"
 #endif
 
-/*
- * This is necessary to access global variables outside the DLL with MSVC,
- * just exporting them in the .def file still leads to linker errors
- * note: dbus_1_EXPORTS is set automatically by CMake when the DLL is built
- */
-#if defined(_MSC_VER)
-#  if defined(dbus_1_EXPORTS)
-#  define DBUS_EXTERN __declspec(dllexport)
-#  else
-#  define DBUS_EXTERN __declspec(dllimport)
-#  endif
-#else
-#define DBUS_EXTERN extern
-#endif
-
 /*
  * (code from GLib)
  * 
@@ -160,7 +145,7 @@ void _dbus_real_assert_not_reached (const char *explanation,
 #define _dbus_return_val_if_fail(condition, val)
 #else
 
-DBUS_EXTERN const char *_dbus_return_if_fail_warning_format;
+extern const char *_dbus_return_if_fail_warning_format;
 
 #define _dbus_return_if_fail(condition) do {                                       \
    _dbus_assert ((*(const char*)_DBUS_FUNCTION_NAME) != '_');                      \
@@ -274,7 +259,7 @@ void _dbus_verbose_bytes_of_string (const DBusString    *str,
 
 const char* _dbus_header_field_to_string (int header_field);
 
-DBUS_EXTERN const char *_dbus_no_memory_message;
+extern const char *_dbus_no_memory_message;
 #define _DBUS_SET_OOM(error) dbus_set_error_const ((error), DBUS_ERROR_NO_MEMORY, _dbus_no_memory_message)
 
 #ifdef DBUS_BUILD_TESTS