From 692bee42051e25f3545448ce4ae8df80e3d5527b Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Fri, 15 Mar 2019 00:40:23 +0100
Subject: [PATCH] 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.
---
 CMakeLists.txt          | 1 -
 configure.ac            | 5 ++---
 src/config.h.cmake.in   | 3 ---
 src/config.h.win32      | 1 -
 src/config.h.win64      | 1 -
 src/config.h.windows.in | 1 -
 6 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06068bc..4ba4d27 100644
--- 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 ba91355..e32dffe 100644
--- 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 f49177f..60db86c 100644
--- 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 b0be0d7..1f848e2 100644
--- 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 5ec6a97..f72671b 100644
--- 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 a5ebc76..d8de1dd 100644
--- 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
-- 
2.40.0