summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/g10lib.h9
-rw-r--r--src/types.h4
2 files changed, 4 insertions, 9 deletions
diff --git a/src/g10lib.h b/src/g10lib.h
index af688700..1070d9e9 100644
--- a/src/g10lib.h
+++ b/src/g10lib.h
@@ -318,13 +318,8 @@ void __gcry_burn_stack (unsigned int bytes);
} while(0)
#define wipememory(_ptr,_len) wipememory2(_ptr,0,_len)
-#ifdef HAVE_U64_TYPEDEF
- #define FASTWIPE_T u64
- #define FASTWIPE_MULT (U64_C(0x0101010101010101))
-#else
- #define FASTWIPE_T u32
- #define FASTWIPE_MULT (0x01010101U)
-#endif
+#define FASTWIPE_T u64
+#define FASTWIPE_MULT (U64_C(0x0101010101010101))
/* Following architectures can handle unaligned accesses fast. */
#if defined(HAVE_GCC_ATTRIBUTE_PACKED) && \
diff --git a/src/types.h b/src/types.h
index dcdba4ff..645ddd62 100644
--- a/src/types.h
+++ b/src/types.h
@@ -123,6 +123,8 @@
typedef uint64_t u64;
# define U64_C(c) (UINT64_C(c))
# define HAVE_U64_TYPEDEF
+# else
+# error No way to declare a 64 bit integer type
# endif
#endif
@@ -132,9 +134,7 @@ typedef union
short b;
char c[1];
long d;
-#ifdef HAVE_U64_TYPEDEF
u64 e;
-#endif
float f;
double g;
} PROPERLY_ALIGNED_TYPE;