summaryrefslogtreecommitdiff
path: root/pjlib/include/pj/config.h
diff options
context:
space:
mode:
authorRiza Sulistyo <riza@teluu.com>2013-06-19 06:47:43 +0000
committerRiza Sulistyo <riza@teluu.com>2013-06-19 06:47:43 +0000
commitd7aa4332dae06ae890053dd13239ddabee46b86c (patch)
tree34c599b317369bcc33827d5ee1200604a6599164 /pjlib/include/pj/config.h
parent7949b9e53b97281cfa4526ffe5cf7c7d887b7025 (diff)
Re #1680: Add initial support for Win64
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4537 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/include/pj/config.h')
-rw-r--r--pjlib/include/pj/config.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h
index 1d593eee..1f787150 100644
--- a/pjlib/include/pj/config.h
+++ b/pjlib/include/pj/config.h
@@ -77,10 +77,15 @@
# define PJ_WIN32 1
#elif defined(PJ_WIN32) || defined(_WIN32) || defined(__WIN32__) || \
- defined(_WIN64) || defined(WIN32) || defined(__TOS_WIN__)
- /*
- * Win32
- */
+ defined(WIN32) || defined(PJ_WIN64) || defined(_WIN64) || \
+ defined(WIN64) || defined(__TOS_WIN__)
+# if defined(PJ_WIN64) || defined(_WIN64) || defined(WIN64)
+ /*
+ * Win64
+ */
+# undef PJ_WIN64
+# define PJ_WIN64 1
+# endif
# undef PJ_WIN32
# define PJ_WIN32 1
# include <pj/compat/os_win32.h>