diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 5 | ||||
| -rw-r--r-- | include/distfiles | 8 | ||||
| -rw-r--r-- | include/mpi.h | 12 | ||||
| -rw-r--r-- | include/types.h | 13 | ||||
| -rw-r--r-- | include/util.h | 1 |
5 files changed, 28 insertions, 11 deletions
diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index bee636750..000000000 --- a/include/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -## Process this file with automake to produce Makefile.in - -EXTRA_DIST = cipher.h errors.h iobuf.h memory.h mpi.h ttyio.h types.h \ - util.h - diff --git a/include/distfiles b/include/distfiles new file mode 100644 index 000000000..342530c4e --- /dev/null +++ b/include/distfiles @@ -0,0 +1,8 @@ +cipher.h +errors.h +iobuf.h +memory.h +mpi.h +ttyio.h +types.h +util.h diff --git a/include/mpi.h b/include/mpi.h index fd93f3075..4e25ab201 100644 --- a/include/mpi.h +++ b/include/mpi.h @@ -45,6 +45,18 @@ int mpi_debug_mode; #define BYTES_PER_MPI_LIMB2 8 typedef unsigned long int mpi_limb_t; typedef signed long int mpi_limb_signed_t; +#elif defined(__hppa__) + #define BITS_PER_MPI_LIMB 32 + #define BYTES_PER_MPI_LIMB 4 + #define BYTES_PER_MPI_LIMB2 8 + typedef unsigned long int mpi_limb_t; + typedef signed long int mpi_limb_signed_t; +#elif defined(__alpha__) + #define BITS_PER_MPI_LIMB 64 + #define BYTES_PER_MPI_LIMB 8 + #define BYTES_PER_MPI_LIMB2 16 + typedef unsigned long int mpi_limb_t; + typedef signed long int mpi_limb_signed_t; #else #error add definions for this machine here #endif diff --git a/include/types.h b/include/types.h index 575f15224..0a2d8752f 100644 --- a/include/types.h +++ b/include/types.h @@ -21,29 +21,29 @@ #ifndef G10_TYPES_H #define G10_TYPES_H -#ifdef __linux__ - /* FIXME: add stuff to configure to detect for typedefs */ - #include <linux/types.h> - #define HAVE_ULONG_TYPEDEF - #define HAVE_USHORT_TYPEDEF -#endif +#include <sys/types.h> + #ifndef HAVE_BYTE_TYPEDEF + #undef byte /* maybe there is a macro with this name */ typedef unsigned char byte; #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 @@ -55,6 +55,7 @@ #endif #ifndef HAVE_U32_TYPEDEF + #undef u32 /* maybe there is a macro with this name */ #if SIZEOF_UNSIGNED_INT == 4 typedef unsigned long u32; #elif SIZEOF_UNSIGNED_LONG == 4 diff --git a/include/util.h b/include/util.h index 69cfc0bb0..6a07fcb73 100644 --- a/include/util.h +++ b/include/util.h @@ -20,6 +20,7 @@ #ifndef G10_UTIL_H #define G10_UTIL_H +#include "types.h" #include "errors.h" #include "types.h" #include "mpi.h" |