Make out of the box build on x86_64 system with complete 32 bit

[cln.git] / include / cln / config.h.in

diff --git a/include/cln/config.h.in b/include/cln/config.h.in
index cc06b50db7f7c08cce705eb2210de9a72bd9d2c9..f59133616e4d211c243a669e1fa9e89d3d194d48 100644 (file)
--- a/include/cln/config.h.in
+++ b/include/cln/config.h.in
@@ -18,49 +18,68 @@
 #ifndef __i386__
 #undef __i386__
 #endif
+
+// Take care not to define both __i386__ and __x86_64__ on those systems with
+// 64 bit kernel and 32 bit userland:
+#ifndef __x86_64__
+#ifndef __i386__
+#undef __x86_64__
+#endif
+#endif
+
 #ifndef __m68k__
 #undef __m68k__
 #endif
+
 // NB: GCC def's __mips__ both on big-endian and little-endian systems.
 #ifndef __mips__
 #undef __mips__
 #endif
+
 #ifndef __mipsel__
 #undef __mipsel__
 #endif
+
 #ifndef __mips64__
 #undef __mips64__
 #endif
+
 #ifndef __sparc__
 #undef __sparc__
 #endif
+
 #ifndef __sparc64__
 #undef __sparc64__
 #endif
+
 #ifndef __alpha__
 #undef __alpha__
 #endif
+
 #ifndef __hppa__
 #undef __hppa__
 #endif
+
 #ifndef __arm__
 #undef __arm__
 #endif
+
 #ifndef __rs6000__
 #undef __rs6000__
 #endif
+
 #ifndef __m88k__
 #undef __m88k__
 #endif
+
 #ifndef __convex__
 #undef __convex__
 #endif
+
 #ifndef __ia64__
 #undef __ia64__
 #endif
-#ifndef __x86_64__
-#undef __x86_64__
-#endif
+
 #ifndef __s390__
 #undef __s390__
 #endif