mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +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
458
common/ChangeLog-2011.include
Normal file
458
common/ChangeLog-2011.include
Normal file
|
@ -0,0 +1,458 @@
|
|||
# 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>
|
||||
|
||||
NB: ChangeLog files are no longer manually maintained. Starting
|
||||
on December 1st, 2011 we put change information only in the GIT
|
||||
commit log, and generate a top-level ChangeLog file from logs at
|
||||
"make dist". See doc/HACKING for details.
|
||||
|
||||
2011-02-01 Werner Koch <wk@g10code.com>
|
||||
|
||||
* cipher.h (PUBKEY_MAX_NPKEY, PUBKEY_MAX_NSKEY): Bump up to
|
||||
accommodate gcrypt ECC keys.
|
||||
|
||||
2011-01-21 Werner Koch <wk@g10code.com>
|
||||
|
||||
* cipher.h (GCRY_PK_USAGE_CERT): Remove compatibility macros
|
||||
because we now require libgcrypt 1.4.6.
|
||||
(GCRY_PK_ECDH): Add replacement.
|
||||
|
||||
2009-08-20 Daiki Ueno <ueno@unixuser.org> (wk)
|
||||
|
||||
* cipher.h (struct DEK): Add field S2K_CACHEID.
|
||||
|
||||
2008-04-18 Werner Koch <wk@g10code.com>
|
||||
|
||||
* cipher.h (CIPHER_ALGO_CAMELLIA256): Change ID to 13.
|
||||
(CIPHER_ALGO_CAMELLIA192): New.
|
||||
|
||||
2007-12-12 Werner Koch <wk@g10code.com>
|
||||
|
||||
* cipher.h (CIPHER_ALGO_CAMELLIA128, CIPHER_ALGO_CAMELLIA256): New.
|
||||
|
||||
2006-09-20 Werner Koch <wk@g10code.com>
|
||||
|
||||
* errors.h, http.h, memory.h, mpi.h, util.h, i18n.h: Removed.
|
||||
* Makefile.am: New.
|
||||
* distfiles: Removed.
|
||||
|
||||
2006-08-16 Werner Koch <wk@g10code.com>
|
||||
|
||||
* keyserver.h: Moved to ../common.
|
||||
* http.h: Retired.
|
||||
|
||||
2006-04-28 Werner Koch <wk@g10code.com>
|
||||
|
||||
* cipher.h (DIGEST_ALGO_SHA224): Define it.
|
||||
|
||||
2006-04-18 Werner Koch <wk@g10code.com>
|
||||
|
||||
* keyserver.h, i18n.h, http.h, cipher.h: Updated to gpg 1.4.3.
|
||||
|
||||
2003-09-04 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* cipher.h: Drop TIGER/192 support.
|
||||
|
||||
* types.h: Prefer using uint64_t when creating a 64-bit unsigned
|
||||
type. This avoids a warning on compilers that support but complain
|
||||
about unsigned long long.
|
||||
|
||||
* util.h: Make sure that only ascii is passed to isfoo
|
||||
functions. (From Werner on stable branch).
|
||||
|
||||
2003-09-04 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* cipher.h (PUBKEY_USAGE_AUTH): Added.
|
||||
|
||||
2003-07-03 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* cipher.h (DBG_CIPHER,g10c_debug_mode): Removed.
|
||||
|
||||
2003-06-11 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* cipher.h: Include gcrypt.h and mapped cipher algo names to
|
||||
gcrypt ones. Removed twofish_old and skipjack. Removed all
|
||||
handle definitions and other raerely used stuff. This file will
|
||||
eventually be entirely removed.
|
||||
|
||||
2003-06-10 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* types.h (struct strlist): Removed.
|
||||
|
||||
2003-05-24 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* cipher.h, i18n.h, iobuf.h, memory.h, mpi.h, types.h, util.h:
|
||||
Edit all preprocessor instructions to remove whitespace before the
|
||||
'#'. This is not required by C89, but there are some compilers
|
||||
out there that don't like it.
|
||||
|
||||
2003-05-14 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* types.h: Add initializer macros for 64-bit unsigned type.
|
||||
|
||||
2003-05-02 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* cipher.h: Add constants for compression algorithms.
|
||||
|
||||
2003-03-11 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* http.h: Add HTTP_FLAG_TRY_SRV.
|
||||
|
||||
2003-02-11 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* types.h: Try and use uint64_t for a 64-bit type.
|
||||
|
||||
2003-02-04 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* cipher.h: Add constants for new SHAs.
|
||||
|
||||
2002-11-13 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* util.h [__CYGWIN32__]: Don't need the registry prototypes. From
|
||||
Werner on stable branch.
|
||||
|
||||
2002-11-06 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* util.h: Add wipememory2() macro (same as wipememory, but can
|
||||
specify the byte to wipe with).
|
||||
|
||||
2002-10-31 Stefan Bellon <sbellon@sbellon.de>
|
||||
|
||||
* util.h [__riscos__]: Prefixed all RISC OS prototypes with
|
||||
riscos_*
|
||||
|
||||
* zlib-riscos.h: New. This is macro magic in order to make the
|
||||
zlib library calls indeed call the RISC OS ZLib module.
|
||||
|
||||
2002-10-31 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* util.h: Add wipememory() macro.
|
||||
|
||||
2002-10-29 Stefan Bellon <sbellon@sbellon.de>
|
||||
|
||||
* util.h: Added parameter argument to make_basename() needed for
|
||||
filetype support.
|
||||
[__riscos__]: Added prototype.
|
||||
|
||||
2002-10-28 Stefan Bellon <sbellon@sbellon.de>
|
||||
|
||||
* util.h [__riscos__]: Added prototypes for new filetype support.
|
||||
|
||||
2002-10-19 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* distfiles, _regex.h: Add _regex.h from glibc 2.3.1.
|
||||
|
||||
2002-10-14 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* keyserver.h: Go to KEYSERVER_PROTO_VERSION 1.
|
||||
|
||||
2002-10-08 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* keyserver.h: Add new error code KEYSERVER_UNREACHABLE.
|
||||
|
||||
2002-10-03 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* util.h: Add new log_warning logger command which can be switched
|
||||
between log_info and log_error via log_set_strict.
|
||||
|
||||
2002-09-24 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* keyserver.h: Add some new error codes for better GPA support.
|
||||
|
||||
2002-09-10 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* mpi.h (mpi_is_protected, mpi_set_protect_flag)
|
||||
(mpi_clear_protect_flag): Removed.
|
||||
(mpi_get_nbit_info, mpi_set_nbit_info): Removed.
|
||||
|
||||
2002-08-13 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* cipher.h: Add AES aliases for RIJNDAEL algo numbers.
|
||||
|
||||
2002-08-07 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* cipher.h: Add md_algo_present().
|
||||
|
||||
2002-08-06 Stefan Bellon <sbellon@sbellon.de>
|
||||
|
||||
* util.h [__riscos__]: Added riscos_getchar().
|
||||
|
||||
2002-06-21 Stefan Bellon <sbellon@sbellon.de>
|
||||
|
||||
* util.h [__riscos__]: Further moving away of RISC OS specific
|
||||
stuff from general code.
|
||||
|
||||
2002-06-20 Stefan Bellon <sbellon@sbellon.de>
|
||||
|
||||
* util.h [__riscos__]: Added riscos_set_filetype().
|
||||
|
||||
2002-06-14 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* util.h: Add pop_strlist() from strgutil.c.
|
||||
|
||||
2002-06-07 Stefan Bellon <sbellon@sbellon.de>
|
||||
|
||||
* util.h [__riscos__]: RISC OS needs strings.h for strcasecmp()
|
||||
and strncasecmp().
|
||||
|
||||
2002-05-22 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* util.h: Add strncasecmp. Removed stricmp and memicmp.
|
||||
|
||||
2002-05-10 Stefan Bellon <sbellon@sbellon.de>
|
||||
|
||||
* mpi.h: New function mpi_debug_alloc_like for M_DEBUG.
|
||||
|
||||
* util.h [__riscos__]: Make use of __func__ that later
|
||||
Norcroft compiler provides.
|
||||
|
||||
* memory.h: Fixed wrong definition of m_alloc_secure_clear.
|
||||
|
||||
2002-04-23 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* util.h: New function answer_is_yes_no_default() to give a
|
||||
default answer.
|
||||
|
||||
2002-04-22 Stefan Bellon <sbellon@sbellon.de>
|
||||
|
||||
* util.h [__riscos__]: Removed riscos_open, riscos_fopen and
|
||||
riscos_fstat as those special versions aren't needed anymore.
|
||||
|
||||
2002-02-19 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* keyserver.h: Add KEYSERVER_NOT_SUPPORTED for unsupported actions
|
||||
(say, a keyserver that has no way to search, or a readonly
|
||||
keyserver that has no way to add).
|
||||
|
||||
2002-01-02 Stefan Bellon <sbellon@sbellon.de>
|
||||
|
||||
* util.h [__riscos__]: Updated prototype list.
|
||||
|
||||
* types.h [__riscos__]: Changed comment wording.
|
||||
|
||||
2001-12-27 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* KEYSERVER_SCHEME_NOT_FOUND should be 127 to match the POSIX
|
||||
system() (via /bin/sh) way of signaling this.
|
||||
|
||||
* Added G10ERR_KEYSERVER
|
||||
|
||||
2001-12-27 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* util.h [MINGW32]: Fixed name of include file.
|
||||
|
||||
2001-12-22 Timo Schulz <ts@winpt.org>
|
||||
|
||||
* util.h (is_file_compressed): New.
|
||||
|
||||
2001-12-19 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* util.h [CYGWIN32]: Allow this as an alias for MINGW32. Include
|
||||
stdarg.h becuase we use the va_list type. By Disastry.
|
||||
|
||||
2001-09-28 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* cipher.h (PUBKEY_USAGE_CERT): New.
|
||||
|
||||
2001-09-07 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* util.h: Add strsep().
|
||||
|
||||
2001-08-30 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* cipher.h (DEK): Added use_mdc.
|
||||
|
||||
2001-08-24 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* cipher.h (md_write): Made buf arg const.
|
||||
|
||||
2001-08-20 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* cipher.h (DEK): Added algo_info_printed;
|
||||
|
||||
* util.h [__riscos__]: Added prototypes and made sure that we
|
||||
never use __attribute__.
|
||||
* cipher.h, iobuf.h, memory.h, mpi.h [__riscos__]: extern hack.
|
||||
* i18n.h [__riscos__]: Use another include file
|
||||
|
||||
2001-05-30 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* ttyio.h (tty_printf): Add missing parenthesis for non gcc.
|
||||
* http.h: Removed trailing comma to make old ccs happy. Both are
|
||||
by Albert Chin.
|
||||
|
||||
2001-05-25 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* ttyio.h (tty_printf): Add printf attribute.
|
||||
|
||||
2001-04-23 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* http.h: New flag HTTP_FLAG_NO_SHUTDOWN.
|
||||
|
||||
2001-04-13 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* iobuf.h: Removed iobuf_fopen.
|
||||
|
||||
2001-03-01 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* errors.h (G10ERR_UNU_SECKEY,G10ERR_UNU_PUBKEY): New
|
||||
|
||||
2000-11-30 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* iobuf.h (iobuf_translate_file_handle): Add prototype.
|
||||
|
||||
2000-11-11 Paul Eggert <eggert@twinsun.com>
|
||||
|
||||
* iobuf.h (iobuf_get_filelength): Now returns off_t, not u32.
|
||||
(struct iobuf_struct, iobuf_set_limit,
|
||||
iobuf_tell, iobuf_seek): Use off_t, not ulong, for file offsets.
|
||||
|
||||
2000-10-12 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* mpi.h: Changed the way mpi_limb_t is defined.
|
||||
|
||||
Wed Sep 6 17:55:47 CEST 2000 Werner Koch <wk@openit.de>
|
||||
|
||||
* iobuf.c (IOBUF_FILELENGTH_LIMIT): New.
|
||||
|
||||
2000-03-14 14:03:43 Werner Koch (wk@habibti.openit.de)
|
||||
|
||||
* types.h (HAVE_U64_TYPEDEF): Defined depending on configure test.
|
||||
|
||||
Thu Jan 13 19:31:58 CET 2000 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* types.h (HAVE_U64_TYPEDEF): Add a test for _LONGLONG which fixes
|
||||
this long living SGI bug. Reported by Alec Habig.
|
||||
|
||||
Sat Dec 4 12:30:28 CET 1999 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* iobuf.h (IOBUFCTRL_CANCEL): Nww.
|
||||
|
||||
Mon Oct 4 21:23:04 CEST 1999 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* errors.h (G10ERR_NOT_PROCESSED): New.
|
||||
|
||||
Wed Sep 15 16:22:17 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
|
||||
* i18n.h: Add support for simple-gettext.
|
||||
|
||||
Tue Jun 29 21:44:25 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
|
||||
* util.h (stricmp): Use strcasecmp as replacement.
|
||||
|
||||
Sat Jun 26 12:15:59 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
|
||||
* cipher.h (MD_HANDLE): Assigned a structure name.
|
||||
|
||||
Fri Apr 9 12:26:25 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
* cipher.h (BLOWFISH160): Removed.
|
||||
|
||||
Tue Apr 6 19:58:12 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
* cipher.h (DEK): increased max. key length to 32 bytes
|
||||
|
||||
|
||||
Sat Feb 20 21:40:49 CET 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
* g10lib.h: Removed file and changed all files that includes this.
|
||||
|
||||
Tue Feb 16 14:10:02 CET 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
* types.h (STRLIST): Add field flags.
|
||||
|
||||
Wed Feb 10 17:15:39 CET 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
* cipher.h (CIPHER_ALGO_TWOFISH): Chnaged ID to 10 and renamed
|
||||
the old experimenatl algorithm to xx_OLD.
|
||||
|
||||
Thu Jan 7 18:00:58 CET 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
* cipher.h (MD_BUFFER_SIZE): Removed.
|
||||
|
||||
Mon Dec 14 21:18:49 CET 1998 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
* types.h: fix for SUNPRO_C
|
||||
|
||||
Tue Dec 8 13:15:16 CET 1998 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
* mpi.h (MPI): Changed the structure name to gcry_mpi and
|
||||
changed all users.
|
||||
|
||||
Tue Oct 20 11:40:00 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* iobuf.h (iobuf_get_temp_buffer): New.
|
||||
|
||||
Tue Oct 13 12:40:48 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* iobuf.h (iobuf_get): Now uses .nofast
|
||||
(iobuf_get2): Removed.
|
||||
|
||||
Mon Sep 14 09:17:22 1998 Werner Koch (wk@(none))
|
||||
|
||||
* util.h (HAVE_ATEXIT): New.
|
||||
(HAVE_RAISE): New.
|
||||
|
||||
Mon Jul 6 10:41:55 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* cipher.h (PUBKEY_USAGE_): New.
|
||||
|
||||
Mon Jul 6 09:49:51 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* iobuf.h (iobuf_set_error): New.
|
||||
(iobuf_error): New.
|
||||
|
||||
Sat Jun 13 17:31:32 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* g10lib.h: New as interface for the g10lib.
|
||||
|
||||
Mon Jun 8 22:14:48 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* cipher.h (CIPHER_ALGO_CAST5): Changed name from .. CAST
|
||||
|
||||
Thu May 21 13:25:51 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* cipher.h: removed ROT 5 and changed one id and add dummy
|
||||
|
||||
Tue May 19 18:09:05 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* cipher.h (DIGEST_ALGO_TIGER): Chnaged id from 101 to 6.
|
||||
|
||||
Mon May 4 16:37:17 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* cipher.h (PUBKEY_ALGO_ELGAMAL_E): New, with value of the
|
||||
old one.
|
||||
* (is_ELGAMAL, is_RSA): New macros
|
||||
|
||||
Sun Apr 26 14:35:24 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* types.h: New type u64
|
||||
|
||||
Mon Mar 9 12:59:55 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* cipher.h: Included dsa.h.
|
||||
|
||||
Tue Mar 3 15:11:21 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
* cipher.h (random.h): Add new header and move all relevalt
|
||||
functions to this header.
|
||||
|
||||
|
||||
Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
|
||||
|
||||
This file is free software; as a special exception the author gives
|
||||
unlimited permission to copy and/or distribute it, with or without
|
||||
modifications, as long as this notice is preserved.
|
||||
|
||||
This file is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
Local Variables:
|
||||
buffer-read-only: t
|
||||
End:
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
EXTRA_DIST = mkstrtable.awk exaudit.awk exstatus.awk ChangeLog-2011 \
|
||||
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
|
||||
if !HAVE_W32CE_SYSTEM
|
||||
|
@ -41,7 +41,7 @@ include $(top_srcdir)/am/cmacros.am
|
|||
|
||||
jnlib_sources = \
|
||||
libjnlib-config.h \
|
||||
types.h dynload.h w32help.h \
|
||||
types.h host2net.h dynload.h w32help.h \
|
||||
stringhelp.c stringhelp.h \
|
||||
strlist.c strlist.h \
|
||||
utf8conv.c utf8conv.h \
|
||||
|
|
52
common/host2net.h
Normal file
52
common/host2net.h
Normal file
|
@ -0,0 +1,52 @@
|
|||
/* host2net.h - Endian conversion macros
|
||||
* Copyright (C) 1998, 2014 Werner Koch
|
||||
*
|
||||
* This file is part of GnuPG.
|
||||
*
|
||||
* This file 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.
|
||||
*
|
||||
* This file 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 GNUPG_COMMON_HOST2NET_H
|
||||
#define GNUPG_COMMON_HOST2NET_H
|
||||
|
||||
#include "types.h"
|
||||
|
||||
#define buftoulong( p ) ((*(byte*)(p) << 24) | (*((byte*)(p)+1)<< 16) | \
|
||||
(*((byte*)(p)+2) << 8) | (*((byte*)(p)+3)))
|
||||
#define buftoushort( p ) ((*((byte*)(p)) << 8) | (*((byte*)(p)+1)))
|
||||
#define ulongtobuf( p, a ) do { \
|
||||
((byte*)p)[0] = a >> 24; \
|
||||
((byte*)p)[1] = a >> 16; \
|
||||
((byte*)p)[2] = a >> 8; \
|
||||
((byte*)p)[3] = a ; \
|
||||
} while(0)
|
||||
#define ushorttobuf( p, a ) do { \
|
||||
((byte*)p)[0] = a >> 8; \
|
||||
((byte*)p)[1] = a ; \
|
||||
} while(0)
|
||||
#define buftou32( p) buftoulong( (p) )
|
||||
#define u32tobuf( p, a) ulongtobuf( (p), (a) )
|
||||
|
||||
|
||||
#endif /*GNUPG_COMMON_HOST2NET_H*/
|
|
@ -31,7 +31,7 @@
|
|||
#ifndef 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/estream.h"
|
||||
|
||||
|
|
|
@ -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