diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-01-24 18:35:00 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-01-24 18:35:00 +0000 |
| commit | 27a6f11c3076651f2a838bac313a09dd470736d8 (patch) | |
| tree | cce2105cb7f2556747d0d8f101cec841d96cc5bc /third_party | |
| parent | 237dbf032a57a72e816ed8dca0bb7e0e89595614 (diff) | |
More ticket #61: error detecting CPU type in srtp_config.h causing libsrtp initialization error
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1740 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/build/srtp/srtp_config.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/third_party/build/srtp/srtp_config.h b/third_party/build/srtp/srtp_config.h index 6d1cfcfc..1cf844ee 100644 --- a/third_party/build/srtp/srtp_config.h +++ b/third_party/build/srtp/srtp_config.h @@ -22,9 +22,13 @@ #include <pj/types.h> /* We'll just define CISC if it's x86 family */ -#if (defined(PJ_M_I386) && PJ_M_I386!=0) || \ - (defined(PJ_M_X86_64) && PJ_M_X86_64!=0) || \ - (defined(PJ_M_IA64) && PJ_M_IA64!=0) +#if defined (PJ_M_I386) || defined(_i386_) || defined(i_386_) || \ + defined(_X86_) || defined(x86) || defined(__i386__) || \ + defined(__i386) || defined(_M_IX86) || defined(__I86__) || \ + defined (PJ_M_X86_64) || defined(__amd64__) || defined(__amd64) || \ + defined(__x86_64__) || defined(__x86_64) || \ + defined(PJ_M_IA64) || defined(__ia64__) || defined(_IA64) || \ + defined(__IA64__) || defined(_M_IA64) # define CPU_CISC 1 /* # define HAVE_X86 1 use X86 inlined assembly code */ #else @@ -113,7 +117,8 @@ typedef pj_int64_t int64_t; #endif -#define SIZEOF_UNSIGNED_LONG 8 +/* These shouldn't really matter as long as HAVE_UINT64_T is set */ +#define SIZEOF_UNSIGNED_LONG (sizeof(unsigned long)) #define SIZEOF_UNSIGNED_LONG_LONG 8 |