summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2003-05-14 18:38:06 +0000
committerBernard Normier <bernard@zeroc.com>2003-05-14 18:38:06 +0000
commitf362fd193951cbd6ec0234fff890cdd64d5d16a0 (patch)
tree1f597d1b2c24c3fc24499931ad96a1dd186ff2fc /cpp/src
parentminor edits (diff)
downloadice-f362fd193951cbd6ec0234fff890cdd64d5d16a0.tar.bz2
ice-f362fd193951cbd6ec0234fff890cdd64d5d16a0.tar.xz
ice-f362fd193951cbd6ec0234fff890cdd64d5d16a0.zip
Opteron port
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceUtil/Unicode.cpp2
-rw-r--r--cpp/src/icecpp/config.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/IceUtil/Unicode.cpp b/cpp/src/IceUtil/Unicode.cpp
index 4a7537a1308..c4ea2d36b16 100644
--- a/cpp/src/IceUtil/Unicode.cpp
+++ b/cpp/src/IceUtil/Unicode.cpp
@@ -18,7 +18,7 @@
#if defined(_WIN32)
# define SIZEOF_WCHAR_T 2
#elif (defined(__sun) && defined(__sparc)) || \
- ((defined(__linux) || defined(__FreeBSD__)) && defined (__i386))
+ ((defined(__linux) || defined(__FreeBSD__)) && (defined(__i386) || defined(__x86_64)))
# define SIZEOF_WCHAR_T 4
#endif
diff --git a/cpp/src/icecpp/config.h b/cpp/src/icecpp/config.h
index b1949ec2d0b..cb8a4568706 100644
--- a/cpp/src/icecpp/config.h
+++ b/cpp/src/icecpp/config.h
@@ -57,7 +57,8 @@
#define LONG_TYPE_SIZE 4
#if defined(_WIN32)
# define WCHAR_TYPE_SIZE 2
-#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(i386) || defined (__sun)
+#elif (defined(__linux) || defined(__FreeBSD__)) && (defined(__i386) || defined(__x86_64)) \
+ || defined (__sun)
# define WCHAR_TYPE_SIZE 4
#else
# error "unsupported operating system or platform"