Changeset 1740


Ignore:
Timestamp:
Jan 24, 2008 6:35:00 PM (11 years ago)
Author:
bennylp
Message:

More ticket #61: error detecting CPU type in srtp_config.h causing libsrtp initialization error

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/third_party/build/srtp/srtp_config.h

    r1738 r1740  
    2323 
    2424/* We'll just define CISC if it's x86 family */ 
    25 #if (defined(PJ_M_I386) && PJ_M_I386!=0) || \ 
    26     (defined(PJ_M_X86_64) && PJ_M_X86_64!=0) || \ 
    27     (defined(PJ_M_IA64) && PJ_M_IA64!=0) 
     25#if defined (PJ_M_I386) || defined(_i386_) || defined(i_386_) || \ 
     26    defined(_X86_) || defined(x86) || defined(__i386__) || \ 
     27    defined(__i386) || defined(_M_IX86) || defined(__I86__) || \ 
     28    defined (PJ_M_X86_64) || defined(__amd64__) || defined(__amd64) || \ 
     29    defined(__x86_64__) || defined(__x86_64) || \ 
     30    defined(PJ_M_IA64) || defined(__ia64__) || defined(_IA64) || \ 
     31    defined(__IA64__) || defined(_M_IA64) 
    2832#   define CPU_CISC         1 
    2933/* #   define HAVE_X86      1   use X86 inlined assembly code */ 
     
    114118#endif 
    115119 
    116 #define SIZEOF_UNSIGNED_LONG        8 
     120/* These shouldn't really matter as long as HAVE_UINT64_T is set */ 
     121#define SIZEOF_UNSIGNED_LONG        (sizeof(unsigned long)) 
    117122#define SIZEOF_UNSIGNED_LONG_LONG   8 
    118123 
Note: See TracChangeset for help on using the changeset viewer.