security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-14 08:13:25 +02:00
Code Activity

Indent nested cpp directives for better readability.

Browse Source 
--
This commit is contained in:
Werner Koch 2012-11-06 17:44:11 +01:00
parent 5093bed275
commit 6209066437
1 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
include/types.h
View File

@ -21,23 +21,22 @@
#define G10_TYPES_H #define G10_TYPES_H
#ifdef HAVE_INTTYPES_H #ifdef HAVE_INTTYPES_H
/* For uint64_t */ # include <inttypes.h> /* For uint64_t */
#include <inttypes.h>
#endif #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
#undef SIZEOF_UNSIGNED_SHORT # undef SIZEOF_UNSIGNED_SHORT
#define SIZEOF_UNSIGNED_SHORT 2 # define SIZEOF_UNSIGNED_SHORT 2
#endif #endif
#if !SIZEOF_UNSIGNED_INT #if !SIZEOF_UNSIGNED_INT
#undef SIZEOF_UNSIGNED_INT # undef SIZEOF_UNSIGNED_INT
#define SIZEOF_UNSIGNED_INT 4 # define SIZEOF_UNSIGNED_INT 4
#endif #endif
#if !SIZEOF_UNSIGNED_LONG #if !SIZEOF_UNSIGNED_LONG
#undef SIZEOF_UNSIGNED_LONG # undef SIZEOF_UNSIGNED_LONG
#define SIZEOF_UNSIGNED_LONG 4 # define SIZEOF_UNSIGNED_LONG 4
#endif #endif
@ -45,52 +44,52 @@
#ifndef HAVE_BYTE_TYPEDEF #ifndef HAVE_BYTE_TYPEDEF
#undef byte /* maybe there is a macro with this name */ # undef byte /* maybe there is a macro with this name */
#ifndef __riscos__ # ifndef __riscos__
typedef unsigned char byte; typedef unsigned char byte;
#else # else
/* Norcroft treats char = unsigned char as legal assignment /* Norcroft treats char = unsigned char as legal assignment
but char* = unsigned char* as illegal assignment but char* = unsigned char* as illegal assignment
and the same applies to the signed variants as well */ and the same applies to the signed variants as well */
typedef char byte; typedef char byte;
#endif # endif
#define HAVE_BYTE_TYPEDEF # define HAVE_BYTE_TYPEDEF
#endif #endif
#ifndef HAVE_USHORT_TYPEDEF #ifndef HAVE_USHORT_TYPEDEF
#undef ushort /* maybe there is a macro with this name */ # undef ushort /* maybe there is a macro with this name */
typedef unsigned short ushort; typedef unsigned short ushort;
#define HAVE_USHORT_TYPEDEF # define HAVE_USHORT_TYPEDEF
#endif #endif
#ifndef HAVE_ULONG_TYPEDEF #ifndef HAVE_ULONG_TYPEDEF
#undef ulong /* maybe there is a macro with this name */ # undef ulong /* maybe there is a macro with this name */
typedef unsigned long ulong; typedef unsigned long ulong;
#define HAVE_ULONG_TYPEDEF # define HAVE_ULONG_TYPEDEF
#endif #endif
#ifndef HAVE_U16_TYPEDEF #ifndef HAVE_U16_TYPEDEF
#undef u16 /* maybe there is a macro with this name */ # undef u16 /* maybe there is a macro with this name */
#if SIZEOF_UNSIGNED_INT == 2 # if SIZEOF_UNSIGNED_INT == 2
typedef unsigned int u16; typedef unsigned int u16;
#elif SIZEOF_UNSIGNED_SHORT == 2 # elif SIZEOF_UNSIGNED_SHORT == 2
typedef unsigned short u16; typedef unsigned short u16;
#else # else
#error no typedef for u16 # error no typedef for u16
#endif # endif
#define HAVE_U16_TYPEDEF # define HAVE_U16_TYPEDEF
#endif #endif
#ifndef HAVE_U32_TYPEDEF #ifndef HAVE_U32_TYPEDEF
#undef u32 /* maybe there is a macro with this name */ # undef u32 /* maybe there is a macro with this name */
#if SIZEOF_UNSIGNED_INT == 4 # if SIZEOF_UNSIGNED_INT == 4
typedef unsigned int u32; typedef unsigned int u32;
#elif SIZEOF_UNSIGNED_LONG == 4 # elif SIZEOF_UNSIGNED_LONG == 4
typedef unsigned long u32; typedef unsigned long u32;
#else # else
#error no typedef for u32 # error no typedef for u32
#endif # endif
#define HAVE_U32_TYPEDEF # define HAVE_U32_TYPEDEF
#endif #endif
/**************** /****************
@ -99,24 +98,24 @@ typedef unsigned long u32;
* Solaris and IRIX. * Solaris and IRIX.
*/ */
#ifndef HAVE_U64_TYPEDEF #ifndef HAVE_U64_TYPEDEF
#undef u64 /* maybe there is a macro with this name */ # undef u64 /* maybe there is a macro with this name */
#if SIZEOF_UINT64_T == 8 # if SIZEOF_UINT64_T == 8
typedef uint64_t u64; typedef uint64_t u64;
#define U64_C(c) (UINT64_C(c)) # define U64_C(c) (UINT64_C(c))
#define HAVE_U64_TYPEDEF # define HAVE_U64_TYPEDEF
#elif SIZEOF_UNSIGNED_INT == 8 # elif SIZEOF_UNSIGNED_INT == 8
typedef unsigned int u64; typedef unsigned int u64;
#define U64_C(c) (c ## U) # define U64_C(c) (c ## U)
#define HAVE_U64_TYPEDEF # define HAVE_U64_TYPEDEF
#elif SIZEOF_UNSIGNED_LONG == 8 # elif SIZEOF_UNSIGNED_LONG == 8
typedef unsigned long u64; typedef unsigned long u64;
#define U64_C(c) (c ## UL) # define U64_C(c) (c ## UL)
#define HAVE_U64_TYPEDEF # define HAVE_U64_TYPEDEF
#elif SIZEOF_UNSIGNED_LONG_LONG == 8 #elif SIZEOF_UNSIGNED_LONG_LONG == 8
typedef unsigned long long u64; typedef unsigned long long u64;
#define U64_C(c) (c ## ULL) # define U64_C(c) (c ## ULL)
#define HAVE_U64_TYPEDEF # define HAVE_U64_TYPEDEF
#endif # endif
#endif #endif
typedef union { typedef union {