--- ./include/Ice/Config.h.orig	Thu Feb 27 12:12:15 2003
+++ ./include/Ice/Config.h	Thu Feb 27 12:12:40 2003
@@ -75,7 +75,7 @@
 inline int getSocketErrno() { return WSAGetLastError(); }
 inline int getDNSErrno() { return WSAGetLastError(); }
 
-#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(i386)
+#elif (defined(__linux__) || defined(__FreeBSD__))
 
 #   include <sys/types.h>
 #   include <unistd.h>
--- ./include/IceUtil/Config.h.orig	Thu Feb 27 12:15:54 2003
+++ ./include/IceUtil/Config.h	Thu Feb 27 12:18:02 2003
@@ -62,12 +62,16 @@
 
 #   define SIZEOF_WCHAR_T 2
 
-#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(i386)
+#elif (defined(__linux__) || defined(__FreeBSD__))
 
 #   define ICE_UTIL_API /**/
 #   define HAVE_READLINE
-#   define SIZEOF_WCHAR_T 4
 
+# if defined(i386)
+#   define SIZEOF_WCHAR_T 4
+# else
+#   error "Unknown WCHAR size on this architecture"
+# endif
 //
 // The ISO C99 standard specifies that in C++ implementations the
 // macros for minimum/maximum integer values should only be defined if