From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Sat, 29 Jun 2013 10:45:22 +0000 (+0200)
Subject: Fixed mingw gcc 4.8.1 complains about double defined macros.
X-Git-Tag: dbus-1.7.6~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5366a920f4d8e04337d33f714037e1d4fc482a0e;p=thirdparty%2Fdbus.git

Fixed mingw gcc 4.8.1 complains about double defined macros.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=67072
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index a961d1ab0..824b5144d 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -19,15 +19,8 @@
 #cmakedefine DBUS_MACHINE_UUID_FILE "@DBUS_MACHINE_UUID_FILE@"
 #cmakedefine DBUS_DAEMONDIR "@DBUS_DAEMONDIR@"
 #cmakedefine PACKAGE "@PACKAGE@"
-/* Version number of package */
-#cmakedefine DBUS_MAJOR_VERSION @DBUS_MAJOR_VERSION@
-#cmakedefine DBUS_MINOR_VERSION @DBUS_MINOR_VERSION@
-#cmakedefine DBUS_MICRO_VERSION @DBUS_MICRO_VERSION@
-#cmakedefine DBUS_VERSION ((@DBUS_MAJOR_VERSION@ << 16) | (@DBUS_MINOR_VERSION@ << 8) | (@DBUS_MICRO_VERSION@))
-#cmakedefine DBUS_VERSION_STRING "@DBUS_VERSION_STRING@"
-#cmakedefine DBUS_ENABLE_STATS
 
-#define VERSION DBUS_VERSION_STRING
+#cmakedefine DBUS_ENABLE_STATS
 
 #define TEST_LISTEN       "@TEST_LISTEN@"