Ignore:
Timestamp:
Jan 19, 2008 3:51:56 PM (16 years ago)
Author:
bennylp
Message:

More work on ticket #452/SRTP. Please see this ticket for detailed changelog

Location:
pjproject/branches/users/nanang/third_party/build/srtp
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed

  • pjproject/branches/users/nanang/third_party/build/srtp

    • Property svn:ignore

      •  

        old new  
        11*.user 
        22*.plg 
         3.*depend 

  • pjproject/branches/users/nanang/third_party/build/srtp/srtp_config.h

    r1717 r1718  
    1 /* config.h for Win32/MSVC */ 
     1#include <pj/types.h> 
    22 
    33/* Define if building for a CISC machine (e.g. Intel). */ 
    4 #define CPU_CISC 1 
     4/* #define CPU_CISC 1 */ 
    55 
    66/* Define if building for a RISC machine (assume slow byte access). */ 
    77/* #undef CPU_RISC */ 
    88 
     9/* PJLIB can't detect CISC vs RISC CPU, so we'll just say RISC here */ 
     10#if defined(PJ_WIN32) && PJ_WIN32!=0 
     11#   define CPU_CISC     1 
     12#else 
     13#   define CPU_RISC     1 
     14#endif 
     15 
    916/* Path to random device */ 
    1017/* #define DEV_URANDOM "/dev/urandom" */ 
    … …  
    1724 
    1825/* Define to use logging to stdout. */ 
    19 #define ERR_REPORTING_STDOUT 1 
     26//#define ERR_REPORTING_STDOUT 1 
    2027 
    2128/* Define this to use ISMAcryp code. */ 
    … …  
    2330 
    2431/* Define to 1 if you have the <arpa/inet.h> header file. */ 
    25 /* #undef HAVE_ARPA_INET_H */ 
     32#ifdef PJ_HAS_ARPA_INET_H  
     33#   define HAVE_ARPA_INET_H 1 
     34#endif 
    2635 
    2736/* Define to 1 if you have the <byteswap.h> header file. */ 
    … …  
    2938 
    3039/* Define to 1 if you have the `inet_aton' function. */ 
    31 /* #undef HAVE_INET_ATON */ 
     40#ifdef PJ_SOCK_HAS_INET_PTON 
     41#   define HAVE_INET_ATON   1 
     42#endif 
    3243 
    3344/* Define to 1 if the system has the type `int16_t'. */ 
    … …  
    5061 
    5162/* Define to 1 if you have the <memory.h> header file. */ 
    52 #define HAVE_MEMORY_H 1 
     63//#define HAVE_MEMORY_H 1 
    5364 
    5465/* Define to 1 if you have the <netinet/in.h> header file. */ 
    55 /* #undef HAVE_NETINET_IN_H */ 
     66#ifdef PJ_HAS_NETINET_IN_H 
     67#   define HAVE_NETINET_IN_H    1 
     68#endif 
    5669 
    5770/* Define to 1 if you have the `socket' function. */ 
    … …  
    6275 
    6376/* Define to 1 if you have the <stdlib.h> header file. */ 
    64 #define HAVE_STDLIB_H 1 
     77#ifdef PJ_HAS_STDLIB_H 
     78#   define HAVE_STDLIB_H 1 
     79#endif 
    6580 
    6681/* Define to 1 if you have the <strings.h> header file. */ 
    67 #define HAVE_STRINGS_H 1 
     82//#define HAVE_STRINGS_H 1 
    6883 
    6984/* Define to 1 if you have the <string.h> header file. */ 
    70 #define HAVE_STRING_H 1 
     85#ifdef PJ_HAS_STRING_H 
     86#   define HAVE_STRING_H 1 
     87#endif 
    7188 
    7289/* Define to 1 if you have the <syslog.h> header file. */ 
    … …  
    7794 
    7895/* Define to 1 if you have the <sys/socket.h> header file. */ 
    79 /* #undef HAVE_SYS_SOCKET_H */ 
     96#ifdef PJ_HAS_SYS_SOCKET_H 
     97#   define HAVE_SYS_SOCKET_H    1 
     98#endif 
    8099 
    81100/* Define to 1 if you have the <sys/stat.h> header file. */ 
    82 #define HAVE_SYS_STAT_H 1 
     101//#define HAVE_SYS_STAT_H 1 
    83102 
    84103/* Define to 1 if you have the <sys/types.h> header file. */ 
    85 #define HAVE_SYS_TYPES_H 1 
     104#ifdef PJ_HAS_SYS_TYPES_H 
     105#   define HAVE_SYS_TYPES_H 1 
     106#endif 
    86107 
    87108/* Define to 1 if you have the <sys/uio.h> header file. */ 
    88109/* #undef HAVE_SYS_UIO_H */ 
    89110 
     111/* Define to 1 if the system has the type `uint8_t'. */ 
     112#define HAVE_UINT8_T 1 
     113 
    90114/* Define to 1 if the system has the type `uint16_t'. */ 
    91115#define HAVE_UINT16_T 1 
    … …  
    97121#define HAVE_UINT64_T 1 
    98122 
    99 /* Define to 1 if the system has the type `uint8_t'. */ 
    100 #define HAVE_UINT8_T 1 
    101  
    102123/* Define to 1 if you have the <unistd.h> header file. */ 
    103 /* #undef HAVE_UNISTD_H */ 
    104  
    105124/* Define to 1 if you have the `usleep' function. */ 
    106 /* #undef HAVE_USLEEP */ 
     125#ifdef PJ_HAS_UNISTD_H 
     126#   define HAVE_UNISTD_H    1 
     127#   define HAVE_USLEEP      1 
     128#endif 
     129 
    107130 
    108131/* Define to 1 if you have the <windows.h> header file. */ 
    109 #define HAVE_WINDOWS_H 1 
     132#if defined(PJ_WIN32) && PJ_WIN32!=0 
     133#   define HAVE_WINDOWS_H 1 
     134#endif 
    110135 
    111136/* Define to 1 if you have the <winsock2.h> header file. */ 
    112 #define HAVE_WINSOCK2_H 1 
     137#ifdef PJ_HAS_WINSOCK2_H  
     138#   define HAVE_WINSOCK2_H 1 
     139#endif 
    113140 
    114141/* Define to use X86 inlined assembly code */ 
    … …  
    131158 
    132159/* The size of a `unsigned long', as computed by sizeof. */ 
    133 #define SIZEOF_UNSIGNED_LONG 4 
     160#define SIZEOF_UNSIGNED_LONG (sizeof(unsigned long)) 
    134161 
    135162/* The size of a `unsigned long long', as computed by sizeof. */ 
    … …  
    146173 
    147174/* Define to 1 if you have the ANSI C header files. */ 
    148 #define STDC_HEADERS 1 
     175//#define STDC_HEADERS 1 
    149176 
    150177/* Write errors to this file */ 
    … …  
    161188/* #undef const */ 
    162189 
    163 /* Define 'inline' to nothing, since the MSVC compiler doesn't support it.  */ 
    164 #define inline  
     190/* MSVC does't have "inline" */ 
     191#if defined(_MSC_VER) 
     192#   define inline _inline 
     193#endif 
    165194 
    166195/* Define to `unsigned' if <sys/types.h> does not define. */ 
    … …  
    176205#endif // VC8+ 
    177206 
    178 #ifndef uint32_t 
    179     typedef unsigned char       uint8_t; 
    180     typedef unsigned short      uint16_t; 
    181     typedef unsigned int        uint32_t; 
    182     typedef unsigned __int64    uint64_t; 
    183     typedef signed char         int8_t; 
    184     typedef short               int16_t; 
    185     typedef int                 int32_t; 
    186     typedef __int64             int64_t; 
     207#ifndef int_types_defined 
     208    typedef pj_uint8_t  uint8_t; 
     209    typedef pj_uint16_t uint16_t; 
     210    typedef pj_uint32_t uint32_t; 
     211    typedef pj_uint64_t uint64_t; 
     212    typedef pj_int8_t   int8_t; 
     213    typedef pj_int16_t  int16_t; 
     214    typedef pj_int32_t  int32_t; 
     215    typedef pj_int64_t  int64_t; 
     216#   define int_types_defined 
    187217#endif 
    188218 
    … …  
    193223    #pragma warning(disable:4244) // conversion from int64 to int 
    194224#endif 
     225 
Note: See TracChangeset for help on using the changeset viewer.