Sync AC_CHECK_SIZEOF

- SIZEOF_SHORT removed since it is not used
- second argument in the AC_CHECK_SIZEOF is not used anymore and can be
  removed.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06068bcd8f7a0be4a4e665efb4e82b1aafc37eaf..4ba4d275fca35cb5ecd47541f208496608a6ffc7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,6 @@ check_include_files(unistd.h    HAVE_UNISTD_H)
 check_include_files(inttypes.h  HAVE_INTTYPES_H)
 check_type_size(int SIZEOF_INT)
 check_type_size(long SIZEOF_LONG)
-check_type_size(short SIZEOF_SHORT)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 

diff --git a/configure.ac b/configure.ac
index ba91355748a2e6dd7813ebd18787c230066a5667..e32dffe0219a9c13dc373ec790802a92ec8cfc9f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -52,9 +52,8 @@ dnl Checks for header files.
 AC_CHECK_HEADERS(sys/time.h unistd.h sys/times.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF([int])
+AC_CHECK_SIZEOF([long])
 
 dnl Checks for library functions.
 AC_FUNC_ALLOCA

diff --git a/src/config.h.cmake.in b/src/config.h.cmake.in
index f49177f6768a4e02dc69ebefd0c8aa6c334fac1e..60db86cb5aebffc614efbfa922c3e76a05aced11 100644 (file)
--- a/src/config.h.cmake.in
+++ b/src/config.h.cmake.in
@@ -43,9 +43,6 @@
 /* The size of `long', as computed by sizeof. */
 #cmakedefine SIZEOF_LONG  ${SIZEOF_LONG}
 
-/* The size of `short', as computed by sizeof. */
-#cmakedefine SIZEOF_SHORT  ${SIZEOF_SHORT}
-
 /* Define if enable CR+NL as line terminator */
 #cmakedefine USE_CRNL_AS_LINE_TERMINATOR  ${USE_CRNL_AS_LINE_TERMINATOR}
 

diff --git a/src/config.h.win32 b/src/config.h.win32
index b0be0d7b4b26e832d963610fff97198bbfeb77f6..1f848e2ce6d8118147b3bac3588b83f5b7a02fcd 100644 (file)
--- a/src/config.h.win32
+++ b/src/config.h.win32
@@ -3,7 +3,6 @@
 #define HAVE_MEMORY_H 1
 #define HAVE_OFF_T 1
 #define SIZEOF_INT 4
-#define SIZEOF_SHORT 2
 #define SIZEOF_LONG 4
 #define SIZEOF_LONG_LONG 8
 #define SIZEOF___INT64 8

diff --git a/src/config.h.win64 b/src/config.h.win64
index 5ec6a975b381d83fe754ca1ce7e6dd4b550e64dc..f72671b69c0f96b8c1c052bbb1785fc9acb88891 100644 (file)
--- a/src/config.h.win64
+++ b/src/config.h.win64
@@ -3,7 +3,6 @@
 #define HAVE_MEMORY_H 1
 #define HAVE_OFF_T 1
 #define SIZEOF_INT 4
-#define SIZEOF_SHORT 2
 #define SIZEOF_LONG 4
 #define SIZEOF_LONG_LONG 8
 #define SIZEOF___INT64 8

diff --git a/src/config.h.windows.in b/src/config.h.windows.in
index a5ebc76e77af85165470ba77435680e95083edf3..d8de1dd53fc78b35c5e5966c347a65ae9acdba5f 100644 (file)
--- a/src/config.h.windows.in
+++ b/src/config.h.windows.in
@@ -3,7 +3,6 @@
 #define HAVE_MEMORY_H 1
 #define HAVE_OFF_T 1
 #define SIZEOF_INT 4
-#define SIZEOF_SHORT 2
 #define SIZEOF_LONG 4
 #define SIZEOF_LONG_LONG 8
 #define SIZEOF___INT64 8