mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-09 21:28:51 +01:00
f0ae40b0c9
* common/util.h: Remove replacement macros for libgpg-error<1.21.
* common/types.h: Ditto.
* common/mischelp.h: Ditto.
* common/t-mapstrings.c: Include t-support.h before stringhelp.h
* common/t-stringhelp.c: Ditto.
* common/t-support.h: Always include gpg-error.h.
* kbx/keybox-search.c: Do not include stringhelp.h so that keybox-defs
comes first.
--
This patch enhances commit d6e0149 from Dec 10.
Signed-off-by: Werner Koch <wk@gnupg.org>
117 lines
3.3 KiB
C
117 lines
3.3 KiB
C
/* types.h - define some extra types
|
|
* Copyright (C) 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG is free software; you can redistribute it and/or modify it
|
|
* under the terms of either
|
|
*
|
|
* - the GNU Lesser General Public License as published by the Free
|
|
* Software Foundation; either version 3 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* or
|
|
*
|
|
* - the GNU General Public License as published by the Free
|
|
* Software Foundation; either version 2 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* or both in parallel, as here.
|
|
*
|
|
* GnuPG is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copies of the GNU General Public License
|
|
* and the GNU Lesser General Public License along with this program;
|
|
* if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef GNUPG_COMMON_TYPES_H
|
|
#define GNUPG_COMMON_TYPES_H
|
|
|
|
#ifdef HAVE_INTTYPES_H
|
|
# include <inttypes.h>
|
|
#endif
|
|
|
|
/* The AC_CHECK_SIZEOF() in configure fails for some machines.
|
|
* we provide some fallback values here */
|
|
#if !SIZEOF_UNSIGNED_SHORT
|
|
# undef SIZEOF_UNSIGNED_SHORT
|
|
# define SIZEOF_UNSIGNED_SHORT 2
|
|
#endif
|
|
#if !SIZEOF_UNSIGNED_INT
|
|
# undef SIZEOF_UNSIGNED_INT
|
|
# define SIZEOF_UNSIGNED_INT 4
|
|
#endif
|
|
#if !SIZEOF_UNSIGNED_LONG
|
|
# undef SIZEOF_UNSIGNED_LONG
|
|
# define SIZEOF_UNSIGNED_LONG 4
|
|
#endif
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
/* We use byte as an abbreviation for unsigned char. On some
|
|
platforms this needs special treatment:
|
|
|
|
- RISC OS:
|
|
Norcroft C treats char = unsigned char as legal assignment
|
|
but char* = unsigned char* as illegal assignment
|
|
and the same applies to the signed variants as well. Thus we use
|
|
char which is anyway unsigned.
|
|
|
|
- Windows:
|
|
Windows typedefs byte in the RPC headers but we need to avoid a
|
|
warning about a double definition.
|
|
*/
|
|
#ifndef HAVE_BYTE_TYPEDEF
|
|
# undef byte /* There might be a macro with this name. */
|
|
# ifdef __riscos__
|
|
typedef char byte;
|
|
# elif !(defined(_WIN32) && defined(cbNDRContext))
|
|
typedef unsigned char byte;
|
|
# endif
|
|
# define HAVE_BYTE_TYPEDEF
|
|
#endif /*!HAVE_BYTE_TYPEDEF*/
|
|
|
|
#ifndef HAVE_USHORT_TYPEDEF
|
|
# undef ushort /* There might be a macro with this name. */
|
|
typedef unsigned short ushort;
|
|
# define HAVE_USHORT_TYPEDEF
|
|
#endif
|
|
|
|
#ifndef HAVE_ULONG_TYPEDEF
|
|
# undef ulong /* There might be a macro with this name. */
|
|
typedef unsigned long ulong;
|
|
# define HAVE_ULONG_TYPEDEF
|
|
#endif
|
|
|
|
#ifndef HAVE_U16_TYPEDEF
|
|
# undef u16 /* There might be a macro with this name. */
|
|
# if SIZEOF_UNSIGNED_INT == 2
|
|
typedef unsigned int u16;
|
|
# elif SIZEOF_UNSIGNED_SHORT == 2
|
|
typedef unsigned short u16;
|
|
# else
|
|
# error no typedef for u16
|
|
# endif
|
|
# define HAVE_U16_TYPEDEF
|
|
#endif
|
|
|
|
#ifndef HAVE_U32_TYPEDEF
|
|
# undef u32 /* There might be a macro with this name. */
|
|
# if SIZEOF_UNSIGNED_INT == 4
|
|
typedef unsigned int u32;
|
|
# elif SIZEOF_UNSIGNED_LONG == 4
|
|
typedef unsigned long u32;
|
|
# else
|
|
# error no typedef for u32
|
|
# endif
|
|
# define HAVE_U32_TYPEDEF
|
|
#endif
|
|
|
|
#endif /*GNUPG_COMMON_TYPES_H*/
|