mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
include: Remove this directory.
* 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>
This commit is contained in:
parent
47bb0d7683
commit
25b4c2acbd
14 changed files with 53 additions and 704 deletions
|
@ -31,6 +31,10 @@
|
|||
#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
|
||||
|
@ -50,15 +54,28 @@
|
|||
#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. */
|
||||
/* Windows typedefs byte in the rpc headers. Avoid warning about
|
||||
double definition. */
|
||||
#if !(defined(_WIN32) && defined(cbNDRContext))
|
||||
typedef unsigned char byte;
|
||||
#endif
|
||||
# ifdef __riscos__
|
||||
typedef char byte;
|
||||
# elif !(defined(_WIN32) && defined(cbNDRContext))
|
||||
typedef unsigned char byte;
|
||||
# endif
|
||||
# define HAVE_BYTE_TYPEDEF
|
||||
#endif
|
||||
#endif /*!HAVE_BYTE_TYPEDEF*/
|
||||
|
||||
#ifndef HAVE_USHORT_TYPEDEF
|
||||
# undef ushort /* There might be a macro with this name. */
|
||||
|
@ -106,6 +123,4 @@
|
|||
# define GNUPG_GCC_A_SENTINEL(a)
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#endif /*LIBJNLIB_TYPES_H*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue