You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by rl...@apache.org on 2017/06/22 12:21:15 UTC
svn commit: r1799572 - /xerces/c/trunk/cmake/XercesIntTypes.cmake
Author: rleigh
Date: Thu Jun 22 12:21:15 2017
New Revision: 1799572
URL: http://svn.apache.org/viewvc?rev=1799572&view=rev
Log:
cmake: XercesIntTypes: Correct signed types and variable names
Modified:
xerces/c/trunk/cmake/XercesIntTypes.cmake
Modified: xerces/c/trunk/cmake/XercesIntTypes.cmake
URL: http://svn.apache.org/viewvc/xerces/c/trunk/cmake/XercesIntTypes.cmake?rev=1799572&r1=1799571&r2=1799572&view=diff
==============================================================================
--- xerces/c/trunk/cmake/XercesIntTypes.cmake (original)
+++ xerces/c/trunk/cmake/XercesIntTypes.cmake Thu Jun 22 12:21:15 2017
@@ -70,13 +70,13 @@ else()
endif()
# Check type sizes
-check_type_size("short" SIZEOF_SHORT)
+check_type_size("signed short" SIZEOF_SHORT)
check_type_size("unsigned short" SIZEOF_UNSIGNED_SHORT)
-check_type_size("int" SIZEOF_INT)
+check_type_size("signed int" SIZEOF_INT)
check_type_size("unsigned int" SIZEOF_UNSIGNED_INT)
-check_type_size("long" SIZEOF_LONG)
+check_type_size("signed long" SIZEOF_LONG)
check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG)
-check_type_size("long long" SIZEOF_LONG_LONG)
+check_type_size("signed long long" SIZEOF_LONG_LONG)
check_type_size("unsigned long long" SIZEOF_UNSIGNED_LONG_LONG)
check_type_size("__int64" SIZEOF___INT64)
check_type_size("unsigned __int64" SIZEOF_UNSIGNED__INT64)
@@ -100,7 +100,7 @@ if(HAVE_CSTDINT OR HAVE_STDINT_H OR HAVE
set(XERCES_U64BIT_INT "uint64_t")
else()
# Fallback to basic language types
- if(SIZEOF_SIGNED_SHORT EQUAL 2)
+ if(SIZEOF_SHORT EQUAL 2)
set(XERCES_S16BIT_INT "signed short")
elseif(SIZEOF_INT EQUAL 2)
set(XERCES_S16BIT_INT "int")
@@ -116,9 +116,9 @@ else()
message(FATAL_ERROR "Couldn't find an unsigned 16-bit type")
endif()
- if(SIZEOF_SIGNED_INT EQUAL 4)
+ if(SIZEOF_INT EQUAL 4)
set(XERCES_S32BIT_INT "signed int")
- elseif(SIZEOF_SIGNED_LONG EQUAL 4)
+ elseif(SIZEOF_LONG EQUAL 4)
set(XERCES_S32BIT_INT "signed long")
else()
message(FATAL_ERROR "Couldn't find a signed 32-bit type")
@@ -133,11 +133,11 @@ else()
endif()
if(SIZEOF_INT EQUAL 8)
- set(XERCES_S64BIT_INT "int")
+ set(XERCES_S64BIT_INT "signed int")
elseif(SIZEOF_LONG EQUAL 8)
- set(XERCES_S64BIT_INT "long")
+ set(XERCES_S64BIT_INT "signed long")
elseif(SIZEOF_LONG_LONG EQUAL 8)
- set(XERCES_S64BIT_INT "long long")
+ set(XERCES_S64BIT_INT "signed long long")
elseif(SIZEOF___INT64 EQUAL 8)
set(XERCES_S64BIT_INT "__int64")
else()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org