security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

build: Use modern Autoconf check for types.

Browse Source 
* common/types.h: Use HAVE_TYPE_BYTE, HAVE_USHORT_TYPEDEF,
HAVE_ULONG_TYPEDEF, HAVE_U16_TYPEDEF, and HAVE_TYPE_U32.
* configure.ac (byte, ushort, ulong, u16, u32): Use AC_CHECK_TYPES.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-11-18 13:33:41 +09:00
parent e37c2e1844
commit aeeb8e975d
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/types.h
View File

@ -67,29 +67,29 @@
Windows typedefs byte in the RPC headers but we need to avoid a Windows typedefs byte in the RPC headers but we need to avoid a
warning about a double definition. warning about a double definition.
*/ */
#ifndef HAVE_BYTE_TYPEDEF #ifndef HAVE_TYPE_BYTE
# undef byte /* There might be a macro with this name. */ # undef byte /* There might be a macro with this name. */
# ifdef __riscos__ # ifdef __riscos__
typedef char byte; typedef char byte;
# elif !(defined(_WIN32) && defined(cbNDRContext)) # elif !(defined(_WIN32) && defined(cbNDRContext))
typedef unsigned char byte; typedef unsigned char byte;
# endif # endif
# define HAVE_BYTE_TYPEDEF # define HAVE_TYPE_BYTE
#endif /*!HAVE_BYTE_TYPEDEF*/ #endif /*!HAVE_TYPE_BYTE*/
#ifndef HAVE_USHORT_TYPEDEF #ifndef HAVE_TYPE_USHORT
# undef ushort /* There might be a macro with this name. */ # undef ushort /* There might be a macro with this name. */
typedef unsigned short ushort; typedef unsigned short ushort;
# define HAVE_USHORT_TYPEDEF # define HAVE_TYPE_USHORT
#endif #endif
#ifndef HAVE_ULONG_TYPEDEF #ifndef HAVE_TYPE_ULONG
# undef ulong /* There might be a macro with this name. */ # undef ulong /* There might be a macro with this name. */
typedef unsigned long ulong; typedef unsigned long ulong;
# define HAVE_ULONG_TYPEDEF # define HAVE_TYPE_ULONG
#endif #endif
#ifndef HAVE_U16_TYPEDEF #ifndef HAVE_TYPE_U16
# undef u16 /* There might be a macro with this name. */ # undef u16 /* There might be a macro with this name. */
# if SIZEOF_UNSIGNED_INT == 2 # if SIZEOF_UNSIGNED_INT == 2
typedef unsigned int u16; typedef unsigned int u16;
@ -98,10 +98,10 @@
# else # else
# error no typedef for u16 # error no typedef for u16
# endif # endif
# define HAVE_U16_TYPEDEF # define HAVE_TYPE_U16
#endif #endif
#ifndef HAVE_U32_TYPEDEF #ifndef HAVE_TYPE_U32
# undef u32 /* There might be a macro with this name. */ # undef u32 /* There might be a macro with this name. */
# if SIZEOF_UNSIGNED_INT == 4 # if SIZEOF_UNSIGNED_INT == 4
typedef unsigned int u32; typedef unsigned int u32;
@ -110,7 +110,7 @@
# else # else
# error no typedef for u32 # error no typedef for u32
# endif # endif
# define HAVE_U32_TYPEDEF # define HAVE_TYPE_U32
#endif #endif
#endif /*GNUPG_COMMON_TYPES_H*/ #endif /*GNUPG_COMMON_TYPES_H*/

7
configure.ac
View File

@ -1384,12 +1384,7 @@ if test x"$endiancheck" = xyes ; then
fi fi
# fixme: we should get rid of the byte type # fixme: we should get rid of the byte type
GNUPG_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF) AC_CHECK_TYPES([byte, ushort, ulong, u16, u32])
GNUPG_CHECK_TYPEDEF(ushort, HAVE_USHORT_TYPEDEF)
GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF)
GNUPG_CHECK_TYPEDEF(u16, HAVE_U16_TYPEDEF)
GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF)
AC_CHECK_SIZEOF(unsigned short) AC_CHECK_SIZEOF(unsigned short)
AC_CHECK_SIZEOF(unsigned int) AC_CHECK_SIZEOF(unsigned int)
AC_CHECK_SIZEOF(unsigned long) AC_CHECK_SIZEOF(unsigned long)