mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
25b4c2acbd
* include/cipher.h: Move to ... * g10/cipher.h: here. * agent/gpg-agent.c: Adjust header file name. * include/host2net.h: Move to ... * common/host2net.h: here. Change license to LGPLv3/GPLv2. Adjust notices to reflect that only me worked on that file. * include/types.h: Remove. * common/types.h: Include inttypes.h. Add byte typedef and comments for __riscos__. * common/iobuf.h: Adjust header file name. * include/_regex.h: Remove this unused file. * include/Makefile.am: Remove. * Makefile.am (SUBDIRS): Remove "include". * configure.ac (AC_CONFIG_FILES): Remove include/Makefile. * include/ChangeLog-2011: Move to ... * common/ChangeLog-2011.include: here. * common/Makefile.am (EXTRA_DIST): Add file. * include/zlib-riscos.h: Move this repo only file to ... * g10/zlib-riscos.h: here. * include/: Remove. -- include/ was a leftover from GnuPG 1.x times. Signed-off-by: Werner Koch <wk@gnupg.org>
127 lines
3.6 KiB
C
127 lines
3.6 KiB
C
/* types.h - define some extra types
|
|
* Copyright (C) 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of JNLIB, which is a subsystem of GnuPG.
|
|
*
|
|
* JNLIB 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.
|
|
*
|
|
* JNLIB 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 LIBJNLIB_TYPES_H
|
|
#define LIBJNLIB_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
|
|
|
|
|
|
/* Some GCC attributes. Note that we use also define some in
|
|
mischelp.h, but this header and types.h are not always included.
|
|
Should eventually be put into one file (e.g. nlib-common.h). */
|
|
#if __GNUC__ >= 4
|
|
# define GNUPG_GCC_A_SENTINEL(a) __attribute__ ((sentinel(a)))
|
|
#else
|
|
# define GNUPG_GCC_A_SENTINEL(a)
|
|
#endif
|
|
|
|
#endif /*LIBJNLIB_TYPES_H*/
|