[PATCH 1/1] Mingw fixes for x64 support.

Ralf Habacker ralf.habacker at freenet.de
Thu Apr 29 06:33:10 PDT 2010


---
 cmake/CMakeLists.txt        |    2 +-
 cmake/ConfigureChecks.cmake |    1 +
 cmake/config.h.cmake        |    3 +++
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index dcf05c1..ff0a573 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -488,7 +488,7 @@ set (DBUS_INTERNAL_CLIENT_DEFINITIONS "-DDBUS_STATIC_BUILD")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dbus-env.bat.cmake ${CMAKE_BINARY_DIR}/bin/dbus-env.bat )
 install_files(/bin FILES ${CMAKE_BINARY_DIR}/bin/dbus-env.bat)
-
+add_definitions(-DHAVE_CONFIG_H=1)
 
 ########### subdirs ###############
 
diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 4b9fbd1..71cf942 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -18,6 +18,7 @@ check_include_file(sys/syslimits.h    HAVE_SYS_SYSLIMITS_H)   # dbus-sysdeps-uni
 check_include_file(errno.h     HAVE_ERRNO_H)    # dbus-sysdeps.c
 check_include_file(signal.h     HAVE_SIGNAL_H)
 check_include_file(locale.h     HAVE_LOCALE_H)
+check_include_file(stdint.h     HAVE_STDINT_H)   # dbus-pipe.h
 
 check_symbol_exists(backtrace    "execinfo.h"       HAVE_BACKTRACE)          #  dbus-sysdeps.c, dbus-sysdeps-win.c
 check_symbol_exists(getgrouplist "grp.h"            HAVE_GETGROUPLIST)       #  dbus-sysdeps.c
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 072dbdf..363faf0 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -143,6 +143,9 @@
 /* Define to 1 if you have locale.h */
 #cmakedefine   HAVE_LOCALE_H 1
 
+/* Define to 1 if you have stdint.h */
+#cmakedefine   HAVE_STDINT_H 1
+
 // symbols
 /* Define to 1 if you have backtrace */
 #cmakedefine   HAVE_BACKTRACE 1
-- 
1.6.5.1.1367.gcd48


--------------070400000405040903040905--


More information about the dbus mailing list