diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2013-06-29 12:45:22 +0200 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2013-08-28 10:53:54 +0200 |
| commit | 5366a920f4d8e04337d33f714037e1d4fc482a0e (patch) | |
| tree | 5d0f893a7ce9cd77f47642340e001537ed2de2fd /cmake | |
| parent | e1bc0164589193f8b5997580f60a5874065357fe (diff) | |
| download | dbus-5366a920f4d8e04337d33f714037e1d4fc482a0e.tar.gz dbus-5366a920f4d8e04337d33f714037e1d4fc482a0e.tar.bz2 dbus-5366a920f4d8e04337d33f714037e1d4fc482a0e.zip | |
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/config.h.cmake | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index a961d1ab..824b5144 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@" |