Ignore:
Timestamp:
Dec 28, 2016 3:28:05 AM (7 years ago)
Author:
nanang
Message:

Re #1900: Merged from trunk (without 3 text conflicts in sln & vcxproj).

Location:
pjproject/branches/projects/uwp/third_party
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/uwp/third_party

    • Property svn:externals deleted
  • pjproject/branches/projects/uwp/third_party/srtp/config_in.h

    r1730 r5512  
    11/* config_in.h.  Generated from configure.in by autoheader.  */ 
     2 
     3/* Define if building universal (internal helper macro) */ 
     4#undef AC_APPLE_UNIVERSAL_BUILD 
    25 
    36/* Define if building for a CISC machine (e.g. Intel). */ 
     
    4346#undef HAVE_INTTYPES_H 
    4447 
     48/* Define to 1 if you have the `crypto' library (-lcrypto). */ 
     49#undef HAVE_LIBCRYPTO 
     50 
     51/* Define to 1 if you have the `dl' library (-ldl). */ 
     52#undef HAVE_LIBDL 
     53 
    4554/* Define to 1 if you have the `socket' library (-lsocket). */ 
    4655#undef HAVE_LIBSOCKET 
    4756 
     57/* Define to 1 if you have the `z' library (-lz). */ 
     58#undef HAVE_LIBZ 
     59 
    4860/* Define to 1 if you have the <machine/types.h> header file. */ 
    4961#undef HAVE_MACHINE_TYPES_H 
     
    5567#undef HAVE_NETINET_IN_H 
    5668 
     69/* Define to 1 if you have the `pcap' library (-lpcap) */ 
     70#undef HAVE_PCAP 
     71 
     72/* Define to 1 if you have the `sigaction' function. */ 
     73#undef HAVE_SIGACTION 
     74 
    5775/* Define to 1 if you have the `socket' function. */ 
    5876#undef HAVE_SOCKET 
     
    115133#undef HAVE_X86 
    116134 
     135/* Define this to use OpenSSL crypto. */ 
     136#undef OPENSSL 
     137 
    117138/* Define to the address where bug reports for this package should be sent. */ 
    118139#undef PACKAGE_BUGREPORT 
     
    127148#undef PACKAGE_TARNAME 
    128149 
     150/* Define to the home page for this package. */ 
     151#undef PACKAGE_URL 
     152 
    129153/* Define to the version of this package. */ 
    130154#undef PACKAGE_VERSION 
    131155 
    132 /* The size of a `unsigned long', as computed by sizeof. */ 
     156/* The size of `unsigned long', as computed by sizeof. */ 
    133157#undef SIZEOF_UNSIGNED_LONG 
    134158 
    135 /* The size of a `unsigned long long', as computed by sizeof. */ 
     159/* The size of `unsigned long long', as computed by sizeof. */ 
    136160#undef SIZEOF_UNSIGNED_LONG_LONG 
    137161 
     
    154178#undef USE_SYSLOG 
    155179 
    156 /* Define to 1 if your processor stores words with the most significant byte 
    157    first (like Motorola and SPARC, unlike Intel and VAX). */ 
    158 #undef WORDS_BIGENDIAN 
     180/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most 
     181   significant byte first (like Motorola and SPARC, unlike Intel). */ 
     182#if defined AC_APPLE_UNIVERSAL_BUILD 
     183# if defined __BIG_ENDIAN__ 
     184#  define WORDS_BIGENDIAN 1 
     185# endif 
     186#else 
     187# ifndef WORDS_BIGENDIAN 
     188#  undef WORDS_BIGENDIAN 
     189# endif 
     190#endif 
    159191 
    160192/* Define to empty if `const' does not conform to ANSI C. */ 
     
    167199#endif 
    168200 
    169 /* Define to `unsigned' if <sys/types.h> does not define. */ 
     201/* Define to `unsigned int' if <sys/types.h> does not define. */ 
    170202#undef size_t 
Note: See TracChangeset for help on using the changeset viewer.