diff options
| author | David Shaw <[email protected]> | 2002-06-29 13:31:13 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-06-29 13:31:13 +0000 |
| commit | 151ee2f47bfdaa1273cdfd4855e937fb8f2e1d06 (patch) | |
| tree | de5bf8049ec1b28b2948ba85542c0a269084a696 /include/types.h | |
| parent | Removed files for CVS reorganization (diff) | |
| download | gnupg-151ee2f47bfdaa1273cdfd4855e937fb8f2e1d06.tar.gz gnupg-151ee2f47bfdaa1273cdfd4855e937fb8f2e1d06.zip | |
Update head to match stable 1.0
Diffstat (limited to 'include/types.h')
| -rw-r--r-- | include/types.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/include/types.h b/include/types.h index baece0bca..b41109ee5 100644 --- a/include/types.h +++ b/include/types.h @@ -1,5 +1,5 @@ /* types.h - some common typedefs - * Copyright (C) 1998 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. * * This file is part of GNUPG. * @@ -18,8 +18,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ifndef GPG_TYPES_H -#define GPG_TYPES_H +#ifndef G10_TYPES_H +#define G10_TYPES_H /* The AC_CHECK_SIZEOF() in configure fails for some machines. @@ -43,7 +43,14 @@ #ifndef HAVE_BYTE_TYPEDEF #undef byte /* maybe there is a macro with this name */ - typedef unsigned char byte; + #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 @@ -121,4 +128,4 @@ typedef struct string_list { } *STRLIST; -#endif /*GPG_TYPES_H*/ +#endif /*G10_TYPES_H*/ |