[deamon-fix] Fix for FoxP in make_kdbus_bus

[platform/upstream/dbus.git] / cmake / ConfigureChecks.cmake

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index e48b60d..33a9cee 100644 (file)
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -54,43 +54,39 @@ check_type_size("__int64"   SIZEOF___INT64)
 if(SIZEOF_INT EQUAL 8)
     set (DBUS_HAVE_INT64 1)
     set (DBUS_INT64_TYPE "int")
-else(SIZEOF_INT EQUAL 8)
-    if(SIZEOF_LONG EQUAL 8)
-        set (DBUS_HAVE_INT64 1)
-        set (DBUS_INT64_TYPE "long")
-    else(SIZEOF_LONG EQUAL 8)
-        if(SIZEOF_LONG_LONG EQUAL 8)
-            set (DBUS_HAVE_INT64 1)
-            set (DBUS_INT64_TYPE "long long")
-        else(SIZEOF_LONG_LONG EQUAL 8)
-            if(SIZEOF___INT64 EQUAL 8)
-                set (DBUS_HAVE_INT64 1)
-                set (DBUS_INT64_TYPE "__int64")
-            endif(SIZEOF___INT64 EQUAL 8)
-        endif(SIZEOF_LONG_LONG EQUAL 8)
-    endif(SIZEOF_LONG EQUAL 8)
+    set (DBUS_INT64_CONSTANT  "(val)")
+    set (DBUS_UINT64_CONSTANT "(val##U)")
+elseif(SIZEOF_LONG EQUAL 8)
+    set (DBUS_HAVE_INT64 1)
+    set (DBUS_INT64_TYPE "long")
+    set (DBUS_INT64_CONSTANT  "(val##L)")
+    set (DBUS_UINT64_CONSTANT "(val##UL)")
+elseif(SIZEOF_LONG_LONG EQUAL 8)
+    set (DBUS_HAVE_INT64 1)
+    set (DBUS_INT64_TYPE "long long")
+    set (DBUS_INT64_CONSTANT  "(val##LL)")
+    set (DBUS_UINT64_CONSTANT "(val##ULL)")
+elseif(SIZEOF___INT64 EQUAL 8)
+    set (DBUS_HAVE_INT64 1)
+    set (DBUS_INT64_TYPE "__int64")
+    set (DBUS_INT64_CONSTANT  "(val##i64)")
+    set (DBUS_UINT64_CONSTANT "(val##ui64)")
 endif(SIZEOF_INT EQUAL 8)
 
 # DBUS_INT32_TYPE
 if(SIZEOF_INT EQUAL 4)
     set (DBUS_INT32_TYPE "int")
-else(SIZEOF_INT EQUAL 4)
-    if(SIZEOF_LONG EQUAL 4)
-        set (DBUS_INT32_TYPE "long")
-    else(SIZEOF_LONG EQUAL 4)
-        if(SIZEOF_LONG_LONG EQUAL 4)
-            set (DBUS_INT32_TYPE "long long")
-        endif(SIZEOF_LONG_LONG EQUAL 4)
-    endif(SIZEOF_LONG EQUAL 4)
+elseif(SIZEOF_LONG EQUAL 4)
+    set (DBUS_INT32_TYPE "long")
+elseif(SIZEOF_LONG_LONG EQUAL 4)
+    set (DBUS_INT32_TYPE "long long")
 endif(SIZEOF_INT EQUAL 4)
 
 # DBUS_INT16_TYPE
 if(SIZEOF_INT EQUAL 2)
     set (DBUS_INT16_TYPE "int")
-else(SIZEOF_INT EQUAL 2)
-    if(SIZEOF_SHORT EQUAL 2)
-        set (DBUS_INT16_TYPE "short")
-    endif(SIZEOF_SHORT EQUAL 2)
+elseif(SIZEOF_SHORT EQUAL 2)
+    set (DBUS_INT16_TYPE "short")
 endif(SIZEOF_INT EQUAL 2)
 
 find_program(DOXYGEN doxygen)