mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01: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:
Werner Koch
parent
47bb0d7683
commit
25b4c2acbd
@ -89,7 +89,7 @@ else
|
|||||||
tests =
|
tests =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SUBDIRS = m4 gl include common ${kbx} \
|
SUBDIRS = m4 gl common ${kbx} \
|
||||||
${gpg} ${keyserver} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
|
${gpg} ${keyserver} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
|
||||||
${tools} po ${doc} ${tests}
|
${tools} po ${doc} ${tests}
|
||||||
|
|
||||||
|
|||||||
@ -51,7 +51,7 @@
|
|||||||
#include "gc-opt-flags.h"
|
#include "gc-opt-flags.h"
|
||||||
#include "exechelp.h"
|
#include "exechelp.h"
|
||||||
#include "asshelp.h"
|
#include "asshelp.h"
|
||||||
#include "../include/cipher.h" /* for PUBKEY_ALGO_ECDSA, PUBKEY_ALGO_ECDH */
|
#include "../g10/cipher.h" /* for PUBKEY_ALGO_ECDSA, PUBKEY_ALGO_ECDH */
|
||||||
#include "../common/init.h"
|
#include "../common/init.h"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,6 @@
|
|||||||
|
# This is the ChangeLog-2011 from the former ../include directory. It
|
||||||
|
# was moved to here after the removal of the directory on 2014-01-29.
|
||||||
|
|
||||||
2011-12-01 Werner Koch <wk@g10code.com>
|
2011-12-01 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
NB: ChangeLog files are no longer manually maintained. Starting
|
NB: ChangeLog files are no longer manually maintained. Starting
|
||||||
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
EXTRA_DIST = mkstrtable.awk exaudit.awk exstatus.awk ChangeLog-2011 \
|
EXTRA_DIST = mkstrtable.awk exaudit.awk exstatus.awk ChangeLog-2011 \
|
||||||
audit-events.h status-codes.h README.jnlib ChangeLog.jnlib \
|
audit-events.h status-codes.h README.jnlib ChangeLog.jnlib \
|
||||||
w32info-rc.h.in gnupg.ico
|
ChangeLog-2011.include w32info-rc.h.in gnupg.ico
|
||||||
|
|
||||||
noinst_LIBRARIES = libcommon.a libcommonpth.a libgpgrl.a
|
noinst_LIBRARIES = libcommon.a libcommonpth.a libgpgrl.a
|
||||||
if !HAVE_W32CE_SYSTEM
|
if !HAVE_W32CE_SYSTEM
|
||||||
@ -41,7 +41,7 @@ include $(top_srcdir)/am/cmacros.am
|
|||||||
|
|
||||||
jnlib_sources = \
|
jnlib_sources = \
|
||||||
libjnlib-config.h \
|
libjnlib-config.h \
|
||||||
types.h dynload.h w32help.h \
|
types.h host2net.h dynload.h w32help.h \
|
||||||
stringhelp.c stringhelp.h \
|
stringhelp.c stringhelp.h \
|
||||||
strlist.c strlist.h \
|
strlist.c strlist.h \
|
||||||
utf8conv.c utf8conv.h \
|
utf8conv.c utf8conv.h \
|
||||||
|
|||||||
@ -1,14 +1,24 @@
|
|||||||
/* host2net.h - Some macros
|
/* host2net.h - Endian conversion macros
|
||||||
* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
|
* Copyright (C) 1998, 2014 Werner Koch
|
||||||
*
|
*
|
||||||
* This file is part of GnuPG.
|
* This file is part of GnuPG.
|
||||||
*
|
*
|
||||||
* GnuPG is free software; you can redistribute it and/or modify
|
* This file is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of either
|
||||||
* the Free Software Foundation; either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
*
|
||||||
* GnuPG is distributed in the hope that it will be useful,
|
* - 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.
|
||||||
|
*
|
||||||
|
* This file is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
@ -17,8 +27,8 @@
|
|||||||
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef G10_HOST2NET_H
|
#ifndef GNUPG_COMMON_HOST2NET_H
|
||||||
#define G10_HOST2NET_H
|
#define GNUPG_COMMON_HOST2NET_H
|
||||||
|
|
||||||
#include "types.h"
|
#include "types.h"
|
||||||
|
|
||||||
@ -39,4 +49,4 @@
|
|||||||
#define u32tobuf( p, a) ulongtobuf( (p), (a) )
|
#define u32tobuf( p, a) ulongtobuf( (p), (a) )
|
||||||
|
|
||||||
|
|
||||||
#endif /*G10_HOST2NET_H*/
|
#endif /*GNUPG_COMMON_HOST2NET_H*/
|
||||||
@ -31,7 +31,7 @@
|
|||||||
#ifndef GNUPG_COMMON_IOBUF_H
|
#ifndef GNUPG_COMMON_IOBUF_H
|
||||||
#define GNUPG_COMMON_IOBUF_H
|
#define GNUPG_COMMON_IOBUF_H
|
||||||
|
|
||||||
#include "../include/types.h" /* fixme: should be moved elsewhere. */
|
#include "../common/types.h"
|
||||||
#include "../common/sysutils.h"
|
#include "../common/sysutils.h"
|
||||||
#include "../common/estream.h"
|
#include "../common/estream.h"
|
||||||
|
|
||||||
|
|||||||
@ -31,6 +31,10 @@
|
|||||||
#ifndef LIBJNLIB_TYPES_H
|
#ifndef LIBJNLIB_TYPES_H
|
||||||
#define 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.
|
/* The AC_CHECK_SIZEOF() in configure fails for some machines.
|
||||||
* we provide some fallback values here */
|
* we provide some fallback values here */
|
||||||
#if !SIZEOF_UNSIGNED_SHORT
|
#if !SIZEOF_UNSIGNED_SHORT
|
||||||
@ -50,15 +54,28 @@
|
|||||||
#include <sys/types.h>
|
#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
|
#ifndef HAVE_BYTE_TYPEDEF
|
||||||
# undef byte /* There might be a macro with this name. */
|
# undef byte /* There might be a macro with this name. */
|
||||||
/* Windows typedefs byte in the rpc headers. Avoid warning about
|
# ifdef __riscos__
|
||||||
double definition. */
|
typedef char byte;
|
||||||
#if !(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_BYTE_TYPEDEF
|
||||||
#endif
|
#endif /*!HAVE_BYTE_TYPEDEF*/
|
||||||
|
|
||||||
#ifndef HAVE_USHORT_TYPEDEF
|
#ifndef HAVE_USHORT_TYPEDEF
|
||||||
# undef ushort /* There might be a macro with this name. */
|
# undef ushort /* There might be a macro with this name. */
|
||||||
@ -106,6 +123,4 @@
|
|||||||
# define GNUPG_GCC_A_SENTINEL(a)
|
# define GNUPG_GCC_A_SENTINEL(a)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif /*LIBJNLIB_TYPES_H*/
|
#endif /*LIBJNLIB_TYPES_H*/
|
||||||
|
|||||||
@ -1710,7 +1710,6 @@ AC_CONFIG_FILES([ m4/Makefile
|
|||||||
Makefile
|
Makefile
|
||||||
po/Makefile.in
|
po/Makefile.in
|
||||||
gl/Makefile
|
gl/Makefile
|
||||||
include/Makefile
|
|
||||||
common/Makefile
|
common/Makefile
|
||||||
common/w32info-rc.h
|
common/w32info-rc.h
|
||||||
kbx/Makefile
|
kbx/Makefile
|
||||||
|
|||||||
@ -48,6 +48,7 @@ endif
|
|||||||
|
|
||||||
common_source = \
|
common_source = \
|
||||||
gpg.h \
|
gpg.h \
|
||||||
|
cipher.h \
|
||||||
build-packet.c \
|
build-packet.c \
|
||||||
compress.c \
|
compress.c \
|
||||||
$(bzip2_source) \
|
$(bzip2_source) \
|
||||||
|
|||||||
@ -51,6 +51,7 @@
|
|||||||
#define PUBKEY_ALGO_ECDH 18
|
#define PUBKEY_ALGO_ECDH 18
|
||||||
#define PUBKEY_ALGO_ECDSA 19
|
#define PUBKEY_ALGO_ECDSA 19
|
||||||
#define PUBKEY_ALGO_ELGAMAL /* 20 */ GCRY_PK_ELG /* Elgamal encr+sign */
|
#define PUBKEY_ALGO_ELGAMAL /* 20 */ GCRY_PK_ELG /* Elgamal encr+sign */
|
||||||
|
#define PUBKEY_ALGO_EDDSA 105 /* Experimental! */
|
||||||
|
|
||||||
#define PUBKEY_USAGE_SIG GCRY_PK_USAGE_SIGN /* Good for signatures. */
|
#define PUBKEY_USAGE_SIG GCRY_PK_USAGE_SIGN /* Good for signatures. */
|
||||||
#define PUBKEY_USAGE_ENC GCRY_PK_USAGE_ENCR /* Good for encryption. */
|
#define PUBKEY_USAGE_ENC GCRY_PK_USAGE_ENCR /* Good for encryption. */
|
||||||
@ -1 +0,0 @@
|
|||||||
EXTRA_DIST = cipher.h types.h host2net.h _regex.h ChangeLog-2011
|
|
||||||
574
include/_regex.h
574
include/_regex.h
@ -1,574 +0,0 @@
|
|||||||
/* Definitions for data structures and routines for the regular
|
|
||||||
expression library.
|
|
||||||
Copyright (C) 1985,1989-93,1995-98,2000,2001,2002
|
|
||||||
Free Software Foundation, Inc.
|
|
||||||
This file is part of the GNU C Library.
|
|
||||||
|
|
||||||
The GNU C Library is free software; you can redistribute it and/or
|
|
||||||
modify it under the terms of the GNU Lesser General Public
|
|
||||||
License as published by the Free Software Foundation; either
|
|
||||||
version 2.1 of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
The GNU C Library 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
|
|
||||||
Lesser General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Lesser General Public
|
|
||||||
License along with the GNU C Library; if not, write to the Free
|
|
||||||
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
|
||||||
MA 02110-1301, USA. */
|
|
||||||
|
|
||||||
#ifndef _REGEX_H
|
|
||||||
#define _REGEX_H 1
|
|
||||||
|
|
||||||
/* Allow the use in C++ code. */
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* POSIX says that <sys/types.h> must be included (by the caller) before
|
|
||||||
<regex.h>. */
|
|
||||||
|
|
||||||
#if !defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE && defined VMS
|
|
||||||
/* VMS doesn't have 'size_t' in <sys/types.h>, even though POSIX says it
|
|
||||||
should be there. */
|
|
||||||
# include <stddef.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* The following two types have to be signed and unsigned integer type
|
|
||||||
wide enough to hold a value of a pointer. For most ANSI compilers
|
|
||||||
ptrdiff_t and size_t should be likely OK. Still size of these two
|
|
||||||
types is 2 for Microsoft C. Ugh... */
|
|
||||||
typedef long int s_reg_t;
|
|
||||||
typedef unsigned long int active_reg_t;
|
|
||||||
|
|
||||||
/* The following bits are used to determine the regexp syntax we
|
|
||||||
recognize. The set/not-set meanings are chosen so that Emacs syntax
|
|
||||||
remains the value 0. The bits are given in alphabetical order, and
|
|
||||||
the definitions shifted by one from the previous bit; thus, when we
|
|
||||||
add or remove a bit, only one other definition need change. */
|
|
||||||
typedef unsigned long int reg_syntax_t;
|
|
||||||
|
|
||||||
/* If this bit is not set, then \ inside a bracket expression is literal.
|
|
||||||
If set, then such a \ quotes the following character. */
|
|
||||||
#define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1)
|
|
||||||
|
|
||||||
/* If this bit is not set, then + and ? are operators, and \+ and \? are
|
|
||||||
literals.
|
|
||||||
If set, then \+ and \? are operators and + and ? are literals. */
|
|
||||||
#define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then character classes are supported. They are:
|
|
||||||
[:alpha:], [:upper:], [:lower:], [:digit:], [:alnum:], [:xdigit:],
|
|
||||||
[:space:], [:print:], [:punct:], [:graph:], and [:cntrl:].
|
|
||||||
If not set, then character classes are not supported. */
|
|
||||||
#define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then ^ and $ are always anchors (outside bracket
|
|
||||||
expressions, of course).
|
|
||||||
If this bit is not set, then it depends:
|
|
||||||
^ is an anchor if it is at the beginning of a regular
|
|
||||||
expression or after an open-group or an alternation operator;
|
|
||||||
$ is an anchor if it is at the end of a regular expression, or
|
|
||||||
before a close-group or an alternation operator.
|
|
||||||
|
|
||||||
This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
|
|
||||||
POSIX draft 11.2 says that * etc. in leading positions is undefined.
|
|
||||||
We already implemented a previous draft which made those constructs
|
|
||||||
invalid, though, so we haven't changed the code back. */
|
|
||||||
#define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then special characters are always special
|
|
||||||
regardless of where they are in the pattern.
|
|
||||||
If this bit is not set, then special characters are special only in
|
|
||||||
some contexts; otherwise they are ordinary. Specifically,
|
|
||||||
* + ? and intervals are only special when not after the beginning,
|
|
||||||
open-group, or alternation operator. */
|
|
||||||
#define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then *, +, ?, and { cannot be first in an re or
|
|
||||||
immediately after an alternation or begin-group operator. */
|
|
||||||
#define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then . matches newline.
|
|
||||||
If not set, then it doesn't. */
|
|
||||||
#define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then . doesn't match NUL.
|
|
||||||
If not set, then it does. */
|
|
||||||
#define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, nonmatching lists [^...] do not match newline.
|
|
||||||
If not set, they do. */
|
|
||||||
#define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, either \{...\} or {...} defines an
|
|
||||||
interval, depending on RE_NO_BK_BRACES.
|
|
||||||
If not set, \{, \}, {, and } are literals. */
|
|
||||||
#define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, +, ? and | aren't recognized as operators.
|
|
||||||
If not set, they are. */
|
|
||||||
#define RE_LIMITED_OPS (RE_INTERVALS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, newline is an alternation operator.
|
|
||||||
If not set, newline is literal. */
|
|
||||||
#define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then '{...}' defines an interval, and \{ and \}
|
|
||||||
are literals.
|
|
||||||
If not set, then '\{...\}' defines an interval. */
|
|
||||||
#define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, (...) defines a group, and \( and \) are literals.
|
|
||||||
If not set, \(...\) defines a group, and ( and ) are literals. */
|
|
||||||
#define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then \<digit> matches <digit>.
|
|
||||||
If not set, then \<digit> is a back-reference. */
|
|
||||||
#define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then | is an alternation operator, and \| is literal.
|
|
||||||
If not set, then \| is an alternation operator, and | is literal. */
|
|
||||||
#define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then an ending range point collating higher
|
|
||||||
than the starting range point, as in [z-a], is invalid.
|
|
||||||
If not set, then when ending range point collates higher than the
|
|
||||||
starting range point, the range is ignored. */
|
|
||||||
#define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then an unmatched ) is ordinary.
|
|
||||||
If not set, then an unmatched ) is invalid. */
|
|
||||||
#define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, succeed as soon as we match the whole pattern,
|
|
||||||
without further backtracking. */
|
|
||||||
#define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, do not process the GNU regex operators.
|
|
||||||
If not set, then the GNU regex operators are recognized. */
|
|
||||||
#define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, turn on internal regex debugging.
|
|
||||||
If not set, and debugging was on, turn it off.
|
|
||||||
This only works if regex.c is compiled -DDEBUG.
|
|
||||||
We define this bit always, so that all that's needed to turn on
|
|
||||||
debugging is to recompile regex.c; the calling code can always have
|
|
||||||
this bit set, and it won't affect anything in the normal case. */
|
|
||||||
#define RE_DEBUG (RE_NO_GNU_OPS << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, a syntactically invalid interval is treated as
|
|
||||||
a string of ordinary characters. For example, the ERE 'a{1' is
|
|
||||||
treated as 'a\{1'. */
|
|
||||||
#define RE_INVALID_INTERVAL_ORD (RE_DEBUG << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then ignore case when matching.
|
|
||||||
If not set, then case is significant. */
|
|
||||||
#define RE_ICASE (RE_INVALID_INTERVAL_ORD << 1)
|
|
||||||
|
|
||||||
/* This global variable defines the particular regexp syntax to use (for
|
|
||||||
some interfaces). When a regexp is compiled, the syntax used is
|
|
||||||
stored in the pattern buffer, so changing this does not affect
|
|
||||||
already-compiled regexps. */
|
|
||||||
extern reg_syntax_t re_syntax_options;
|
|
||||||
|
|
||||||
/* Define combinations of the above bits for the standard possibilities.
|
|
||||||
(The [[[ comments delimit what gets put into the Texinfo file, so
|
|
||||||
don't delete them!) */
|
|
||||||
/* [[[begin syntaxes]]] */
|
|
||||||
#define RE_SYNTAX_EMACS 0
|
|
||||||
|
|
||||||
#define RE_SYNTAX_AWK \
|
|
||||||
(RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \
|
|
||||||
| RE_NO_BK_PARENS | RE_NO_BK_REFS \
|
|
||||||
| RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \
|
|
||||||
| RE_DOT_NEWLINE | RE_CONTEXT_INDEP_ANCHORS \
|
|
||||||
| RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS)
|
|
||||||
|
|
||||||
#define RE_SYNTAX_GNU_AWK \
|
|
||||||
((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG) \
|
|
||||||
& ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS \
|
|
||||||
| RE_CONTEXT_INVALID_OPS ))
|
|
||||||
|
|
||||||
#define RE_SYNTAX_POSIX_AWK \
|
|
||||||
(RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \
|
|
||||||
| RE_INTERVALS | RE_NO_GNU_OPS)
|
|
||||||
|
|
||||||
#define RE_SYNTAX_GREP \
|
|
||||||
(RE_BK_PLUS_QM | RE_CHAR_CLASSES \
|
|
||||||
| RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \
|
|
||||||
| RE_NEWLINE_ALT)
|
|
||||||
|
|
||||||
#define RE_SYNTAX_EGREP \
|
|
||||||
(RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \
|
|
||||||
| RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \
|
|
||||||
| RE_NEWLINE_ALT | RE_NO_BK_PARENS \
|
|
||||||
| RE_NO_BK_VBAR)
|
|
||||||
|
|
||||||
#define RE_SYNTAX_POSIX_EGREP \
|
|
||||||
(RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES \
|
|
||||||
| RE_INVALID_INTERVAL_ORD)
|
|
||||||
|
|
||||||
/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */
|
|
||||||
#define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC
|
|
||||||
|
|
||||||
#define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC
|
|
||||||
|
|
||||||
/* Syntax bits common to both basic and extended POSIX regex syntax. */
|
|
||||||
#define _RE_SYNTAX_POSIX_COMMON \
|
|
||||||
(RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \
|
|
||||||
| RE_INTERVALS | RE_NO_EMPTY_RANGES)
|
|
||||||
|
|
||||||
#define RE_SYNTAX_POSIX_BASIC \
|
|
||||||
(_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM)
|
|
||||||
|
|
||||||
/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes
|
|
||||||
RE_LIMITED_OPS, i.e., \? \+ \| are not recognized. Actually, this
|
|
||||||
isn't minimal, since other operators, such as \`, aren't disabled. */
|
|
||||||
#define RE_SYNTAX_POSIX_MINIMAL_BASIC \
|
|
||||||
(_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS)
|
|
||||||
|
|
||||||
#define RE_SYNTAX_POSIX_EXTENDED \
|
|
||||||
(_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \
|
|
||||||
| RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES \
|
|
||||||
| RE_NO_BK_PARENS | RE_NO_BK_VBAR \
|
|
||||||
| RE_CONTEXT_INVALID_OPS | RE_UNMATCHED_RIGHT_PAREN_ORD)
|
|
||||||
|
|
||||||
/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INDEP_OPS is
|
|
||||||
removed and RE_NO_BK_REFS is added. */
|
|
||||||
#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED \
|
|
||||||
(_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \
|
|
||||||
| RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES \
|
|
||||||
| RE_NO_BK_PARENS | RE_NO_BK_REFS \
|
|
||||||
| RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD)
|
|
||||||
/* [[[end syntaxes]]] */
|
|
||||||
|
|
||||||
/* Maximum number of duplicates an interval can allow. Some systems
|
|
||||||
(erroneously) define this in other header files, but we want our
|
|
||||||
value, so remove any previous define. */
|
|
||||||
#ifdef RE_DUP_MAX
|
|
||||||
# undef RE_DUP_MAX
|
|
||||||
#endif
|
|
||||||
/* If sizeof(int) == 2, then ((1 << 15) - 1) overflows. */
|
|
||||||
#define RE_DUP_MAX (0x7fff)
|
|
||||||
|
|
||||||
|
|
||||||
/* POSIX 'cflags' bits (i.e., information for 'regcomp'). */
|
|
||||||
|
|
||||||
/* If this bit is set, then use extended regular expression syntax.
|
|
||||||
If not set, then use basic regular expression syntax. */
|
|
||||||
#define REG_EXTENDED 1
|
|
||||||
|
|
||||||
/* If this bit is set, then ignore case when matching.
|
|
||||||
If not set, then case is significant. */
|
|
||||||
#define REG_ICASE (REG_EXTENDED << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then anchors do not match at newline
|
|
||||||
characters in the string.
|
|
||||||
If not set, then anchors do match at newlines. */
|
|
||||||
#define REG_NEWLINE (REG_ICASE << 1)
|
|
||||||
|
|
||||||
/* If this bit is set, then report only success or fail in regexec.
|
|
||||||
If not set, then returns differ between not matching and errors. */
|
|
||||||
#define REG_NOSUB (REG_NEWLINE << 1)
|
|
||||||
|
|
||||||
|
|
||||||
/* POSIX 'eflags' bits (i.e., information for regexec). */
|
|
||||||
|
|
||||||
/* If this bit is set, then the beginning-of-line operator doesn't match
|
|
||||||
the beginning of the string (presumably because it's not the
|
|
||||||
beginning of a line).
|
|
||||||
If not set, then the beginning-of-line operator does match the
|
|
||||||
beginning of the string. */
|
|
||||||
#define REG_NOTBOL 1
|
|
||||||
|
|
||||||
/* Like REG_NOTBOL, except for the end-of-line. */
|
|
||||||
#define REG_NOTEOL (1 << 1)
|
|
||||||
|
|
||||||
|
|
||||||
/* If any error codes are removed, changed, or added, update the
|
|
||||||
're_error_msg' table in regex.c. */
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
#ifdef _XOPEN_SOURCE
|
|
||||||
REG_ENOSYS = -1, /* This will never happen for this implementation. */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
REG_NOERROR = 0, /* Success. */
|
|
||||||
REG_NOMATCH, /* Didn't find a match (for regexec). */
|
|
||||||
|
|
||||||
/* POSIX regcomp return error codes. (In the order listed in the
|
|
||||||
standard.) */
|
|
||||||
REG_BADPAT, /* Invalid pattern. */
|
|
||||||
REG_ECOLLATE, /* Not implemented. */
|
|
||||||
REG_ECTYPE, /* Invalid character class name. */
|
|
||||||
REG_EESCAPE, /* Trailing backslash. */
|
|
||||||
REG_ESUBREG, /* Invalid back reference. */
|
|
||||||
REG_EBRACK, /* Unmatched left bracket. */
|
|
||||||
REG_EPAREN, /* Parenthesis imbalance. */
|
|
||||||
REG_EBRACE, /* Unmatched \{. */
|
|
||||||
REG_BADBR, /* Invalid contents of \{\}. */
|
|
||||||
REG_ERANGE, /* Invalid range end. */
|
|
||||||
REG_ESPACE, /* Ran out of memory. */
|
|
||||||
REG_BADRPT, /* No preceding re for repetition op. */
|
|
||||||
|
|
||||||
/* Error codes we've added. */
|
|
||||||
REG_EEND, /* Premature end. */
|
|
||||||
REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */
|
|
||||||
REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */
|
|
||||||
} reg_errcode_t;
|
|
||||||
|
|
||||||
/* This data structure represents a compiled pattern. Before calling
|
|
||||||
the pattern compiler, the fields 'buffer', 'allocated', 'fastmap',
|
|
||||||
'translate', and 'no_sub' can be set. After the pattern has been
|
|
||||||
compiled, the 're_nsub' field is available. All other fields are
|
|
||||||
private to the regex routines. */
|
|
||||||
|
|
||||||
#ifndef RE_TRANSLATE_TYPE
|
|
||||||
# define RE_TRANSLATE_TYPE char *
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct re_pattern_buffer
|
|
||||||
{
|
|
||||||
/* [[[begin pattern_buffer]]] */
|
|
||||||
/* Space that holds the compiled pattern. It is declared as
|
|
||||||
'unsigned char *' because its elements are
|
|
||||||
sometimes used as array indexes. */
|
|
||||||
unsigned char *buffer;
|
|
||||||
|
|
||||||
/* Number of bytes to which 'buffer' points. */
|
|
||||||
unsigned long int allocated;
|
|
||||||
|
|
||||||
/* Number of bytes actually used in 'buffer'. */
|
|
||||||
unsigned long int used;
|
|
||||||
|
|
||||||
/* Syntax setting with which the pattern was compiled. */
|
|
||||||
reg_syntax_t syntax;
|
|
||||||
|
|
||||||
/* Pointer to a fastmap, if any, otherwise zero. re_search uses
|
|
||||||
the fastmap, if there is one, to skip over impossible
|
|
||||||
starting points for matches. */
|
|
||||||
char *fastmap;
|
|
||||||
|
|
||||||
/* Either a translate table to apply to all characters before
|
|
||||||
comparing them, or zero for no translation. The translation
|
|
||||||
is applied to a pattern when it is compiled and to a string
|
|
||||||
when it is matched. */
|
|
||||||
RE_TRANSLATE_TYPE translate;
|
|
||||||
|
|
||||||
/* Number of subexpressions found by the compiler. */
|
|
||||||
size_t re_nsub;
|
|
||||||
|
|
||||||
/* Zero if this pattern cannot match the empty string, one else.
|
|
||||||
Well, in truth it's used only in 're_search_2', to see
|
|
||||||
whether or not we should use the fastmap, so we don't set
|
|
||||||
this absolutely perfectly; see 're_compile_fastmap' (the
|
|
||||||
'duplicate' case). */
|
|
||||||
unsigned can_be_null : 1;
|
|
||||||
|
|
||||||
/* If REGS_UNALLOCATED, allocate space in the 'regs' structure
|
|
||||||
for 'max (RE_NREGS, re_nsub + 1)' groups.
|
|
||||||
If REGS_REALLOCATE, reallocate space if necessary.
|
|
||||||
If REGS_FIXED, use what's there. */
|
|
||||||
#define REGS_UNALLOCATED 0
|
|
||||||
#define REGS_REALLOCATE 1
|
|
||||||
#define REGS_FIXED 2
|
|
||||||
unsigned regs_allocated : 2;
|
|
||||||
|
|
||||||
/* Set to zero when 'regex_compile' compiles a pattern; set to one
|
|
||||||
by 're_compile_fastmap' if it updates the fastmap. */
|
|
||||||
unsigned fastmap_accurate : 1;
|
|
||||||
|
|
||||||
/* If set, 're_match_2' does not return information about
|
|
||||||
subexpressions. */
|
|
||||||
unsigned no_sub : 1;
|
|
||||||
|
|
||||||
/* If set, a beginning-of-line anchor doesn't match at the
|
|
||||||
beginning of the string. */
|
|
||||||
unsigned not_bol : 1;
|
|
||||||
|
|
||||||
/* Similarly for an end-of-line anchor. */
|
|
||||||
unsigned not_eol : 1;
|
|
||||||
|
|
||||||
/* If true, an anchor at a newline matches. */
|
|
||||||
unsigned newline_anchor : 1;
|
|
||||||
|
|
||||||
/* [[[end pattern_buffer]]] */
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef struct re_pattern_buffer regex_t;
|
|
||||||
|
|
||||||
/* Type for byte offsets within the string. POSIX mandates this. */
|
|
||||||
typedef int regoff_t;
|
|
||||||
|
|
||||||
|
|
||||||
/* This is the structure we store register match data in. See
|
|
||||||
regex.texinfo for a full description of what registers match. */
|
|
||||||
struct re_registers
|
|
||||||
{
|
|
||||||
unsigned num_regs;
|
|
||||||
regoff_t *start;
|
|
||||||
regoff_t *end;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/* If 'regs_allocated' is REGS_UNALLOCATED in the pattern buffer,
|
|
||||||
're_match_2' returns information about at least this many registers
|
|
||||||
the first time a 'regs' structure is passed. */
|
|
||||||
#ifndef RE_NREGS
|
|
||||||
# define RE_NREGS 30
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* POSIX specification for registers. Aside from the different names than
|
|
||||||
're_registers', POSIX uses an array of structures, instead of a
|
|
||||||
structure of arrays. */
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
regoff_t rm_so; /* Byte offset from string's start to substring's start. */
|
|
||||||
regoff_t rm_eo; /* Byte offset from string's start to substring's end. */
|
|
||||||
} regmatch_t;
|
|
||||||
|
|
||||||
/* Declarations for routines. */
|
|
||||||
|
|
||||||
/* To avoid duplicating every routine declaration -- once with a
|
|
||||||
prototype (if we are ANSI), and once without (if we aren't) -- we
|
|
||||||
use the following macro to declare argument types. This
|
|
||||||
unfortunately clutters up the declarations a bit, but I think it's
|
|
||||||
worth it. */
|
|
||||||
|
|
||||||
#if __STDC__
|
|
||||||
|
|
||||||
# define _RE_ARGS(args) args
|
|
||||||
|
|
||||||
#else /* not __STDC__ */
|
|
||||||
|
|
||||||
# define _RE_ARGS(args) ()
|
|
||||||
|
|
||||||
#endif /* not __STDC__ */
|
|
||||||
|
|
||||||
/* Sets the current default syntax to SYNTAX, and return the old syntax.
|
|
||||||
You can also simply assign to the 're_syntax_options' variable. */
|
|
||||||
extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax));
|
|
||||||
|
|
||||||
/* Compile the regular expression PATTERN, with length LENGTH
|
|
||||||
and syntax given by the global 're_syntax_options', into the buffer
|
|
||||||
BUFFER. Return NULL if successful, and an error string if not. */
|
|
||||||
extern const char *re_compile_pattern
|
|
||||||
_RE_ARGS ((const char *pattern, size_t length,
|
|
||||||
struct re_pattern_buffer *buffer));
|
|
||||||
|
|
||||||
|
|
||||||
/* Compile a fastmap for the compiled pattern in BUFFER; used to
|
|
||||||
accelerate searches. Return 0 if successful and -2 if was an
|
|
||||||
internal error. */
|
|
||||||
extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer));
|
|
||||||
|
|
||||||
|
|
||||||
/* Search in the string STRING (with length LENGTH) for the pattern
|
|
||||||
compiled into BUFFER. Start searching at position START, for RANGE
|
|
||||||
characters. Return the starting position of the match, -1 for no
|
|
||||||
match, or -2 for an internal error. Also return register
|
|
||||||
information in REGS (if REGS and BUFFER->no_sub are nonzero). */
|
|
||||||
extern int re_search
|
|
||||||
_RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
|
|
||||||
int length, int start, int range, struct re_registers *regs));
|
|
||||||
|
|
||||||
|
|
||||||
/* Like 're_search', but search in the concatenation of STRING1 and
|
|
||||||
STRING2. Also, stop searching at index START + STOP. */
|
|
||||||
extern int re_search_2
|
|
||||||
_RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
|
|
||||||
int length1, const char *string2, int length2,
|
|
||||||
int start, int range, struct re_registers *regs, int stop));
|
|
||||||
|
|
||||||
|
|
||||||
/* Like 're_search', but return how many characters in STRING the regexp
|
|
||||||
in BUFFER matched, starting at position START. */
|
|
||||||
extern int re_match
|
|
||||||
_RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
|
|
||||||
int length, int start, struct re_registers *regs));
|
|
||||||
|
|
||||||
|
|
||||||
/* Relates to 're_match' as 're_search_2' relates to 're_search'. */
|
|
||||||
extern int re_match_2
|
|
||||||
_RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
|
|
||||||
int length1, const char *string2, int length2,
|
|
||||||
int start, struct re_registers *regs, int stop));
|
|
||||||
|
|
||||||
|
|
||||||
/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
|
|
||||||
ENDS. Subsequent matches using BUFFER and REGS will use this memory
|
|
||||||
for recording register information. STARTS and ENDS must be
|
|
||||||
allocated with malloc, and must each be at least `NUM_REGS * sizeof
|
|
||||||
(regoff_t)' bytes long.
|
|
||||||
|
|
||||||
If NUM_REGS == 0, then subsequent matches should allocate their own
|
|
||||||
register data.
|
|
||||||
|
|
||||||
Unless this function is called, the first search or match using
|
|
||||||
PATTERN_BUFFER will allocate its own register data, without
|
|
||||||
freeing the old data. */
|
|
||||||
extern void re_set_registers
|
|
||||||
_RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs,
|
|
||||||
unsigned num_regs, regoff_t *starts, regoff_t *ends));
|
|
||||||
|
|
||||||
#if defined _REGEX_RE_COMP || defined _LIBC
|
|
||||||
# ifndef _CRAY
|
|
||||||
/* 4.2 bsd compatibility. */
|
|
||||||
extern char *re_comp _RE_ARGS ((const char *));
|
|
||||||
extern int re_exec _RE_ARGS ((const char *));
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* GCC 2.95 and later have "__restrict"; C99 compilers have
|
|
||||||
"restrict", and "configure" may have defined "restrict". */
|
|
||||||
#ifndef __restrict
|
|
||||||
# if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__))
|
|
||||||
# if defined restrict || 199901L <= __STDC_VERSION__
|
|
||||||
# define __restrict restrict
|
|
||||||
# else
|
|
||||||
# define __restrict
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
/* gcc 3.1 and up support the [restrict] syntax. */
|
|
||||||
#ifndef __restrict_arr
|
|
||||||
# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
|
|
||||||
# define __restrict_arr __restrict
|
|
||||||
# else
|
|
||||||
# define __restrict_arr
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* POSIX compatibility. */
|
|
||||||
extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,
|
|
||||||
const char *__restrict __pattern,
|
|
||||||
int __cflags));
|
|
||||||
|
|
||||||
extern int regexec _RE_ARGS ((const regex_t *__restrict __preg,
|
|
||||||
const char *__restrict __string, size_t __nmatch,
|
|
||||||
regmatch_t __pmatch[__restrict_arr],
|
|
||||||
int __eflags));
|
|
||||||
|
|
||||||
extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg,
|
|
||||||
char *__errbuf, size_t __errbuf_size));
|
|
||||||
|
|
||||||
extern void regfree _RE_ARGS ((regex_t *__preg));
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif /* C++ */
|
|
||||||
|
|
||||||
#endif /* regex.h */
|
|
||||||
|
|
||||||
/*
|
|
||||||
Local variables:
|
|
||||||
make-backup-files: t
|
|
||||||
version-control: t
|
|
||||||
trim-versions-without-asking: nil
|
|
||||||
End:
|
|
||||||
*/
|
|
||||||
105
include/types.h
105
include/types.h
@ -1,105 +0,0 @@
|
|||||||
/* types.h - some common typedefs
|
|
||||||
* Copyright (C) 1998, 1999, 2000, 2001 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 the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* 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 copy of the GNU General Public License
|
|
||||||
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef G10_TYPES_H
|
|
||||||
#define G10_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>
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef HAVE_BYTE_TYPEDEF
|
|
||||||
#undef byte /* maybe there is a macro with this name */
|
|
||||||
#ifndef __riscos__
|
|
||||||
typedef unsigned char byte;
|
|
||||||
#else
|
|
||||||
/* Norcroft treats char = unsigned char as legal assignment
|
|
||||||
but char* = unsigned char* as illegal assignment
|
|
||||||
and the same applies to the signed variants as well */
|
|
||||||
typedef char byte;
|
|
||||||
#endif
|
|
||||||
#define HAVE_BYTE_TYPEDEF
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef HAVE_USHORT_TYPEDEF
|
|
||||||
#undef ushort /* maybe there is a macro with this name */
|
|
||||||
typedef unsigned short ushort;
|
|
||||||
#define HAVE_USHORT_TYPEDEF
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef HAVE_ULONG_TYPEDEF
|
|
||||||
#undef ulong /* maybe there is a macro with this name */
|
|
||||||
typedef unsigned long ulong;
|
|
||||||
#define HAVE_ULONG_TYPEDEF
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef HAVE_U16_TYPEDEF
|
|
||||||
#undef u16 /* maybe there is 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 /* maybe there is 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
|
|
||||||
|
|
||||||
|
|
||||||
typedef union {
|
|
||||||
int a;
|
|
||||||
short b;
|
|
||||||
char c[1];
|
|
||||||
long d;
|
|
||||||
float f;
|
|
||||||
double g;
|
|
||||||
} PROPERLY_ALIGNED_TYPE;
|
|
||||||
|
|
||||||
#endif /*G10_TYPES_H*/
|
|
||||||
Loading…
x
Reference in New Issue
Block a user