Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/curl/patches/002-curlbuild.h.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Mon, 11 Apr 2011 08:35:06 -0700
changeset 174 187aa0541610
child 2151 8977d970976a
permissions -rw-r--r--
7031766 LCMS needs to move to Userland 7033229 CURL should move to Userland 7007881 Curl not configured to find certs in /etc/certs/CA
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
174
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
--- include/curl/curlbuild.h	2010-10-12 15:04:32.000000000 -0700
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
+++ include/curl/curlbuild.h	2010-12-02 10:18:42.364070201 -0800
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
@@ -496,6 +496,45 @@
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
 #  define CURL_SIZEOF_CURL_SOCKLEN_T 4
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
 /* ===================================== */
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
+/*    Sun Studio Compilers		 */
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
+/* ===================================== */
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
+
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
+#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
+#include <stdint.h>
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
+#include <sys/types.h>
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
+#include <sys/socket.h>
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
+
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
+#  define CURL_TYPEOF_CURL_OFF_T off_t
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
+#  define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
+#  if defined(__amd64) || defined(__sparcv9)
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
+#     define CURL_SIZEOF_CURL_OFF_T 8
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
+#     define CURL_SIZEOF_LONG 8
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
+#     define CURL_FORMAT_CURL_OFF_T  "ld"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
+#     define CURL_FORMAT_CURL_OFF_TU "lu"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
+#     define CURL_FORMAT_OFF_T       "%ld"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
+#     define CURL_SUFFIX_CURL_OFF_T L
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
+#     define CURL_SUFFIX_CURL_OFF_TU UL
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
 
+#  else
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
 
+#     define CURL_SIZEOF_LONG 4
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
+#     if _FILE_OFFSET_BITS == 64 && _LARGEFILE_SOURCE != 0
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
+#        define CURL_SIZEOF_CURL_OFF_T 8
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
+#        define CURL_FORMAT_CURL_OFF_T  "lld"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
+#        define CURL_FORMAT_CURL_OFF_TU "llu"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
 
+#        define CURL_FORMAT_OFF_T       "%lld"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
 
+#        define CURL_SUFFIX_CURL_OFF_T LL
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    34
 
+#        define CURL_SUFFIX_CURL_OFF_TU ULL
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    35
 
+#     else
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    36
 
+#        define CURL_SIZEOF_CURL_OFF_T 4
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    37
 
+#        define CURL_FORMAT_CURL_OFF_T  "ld"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    38
 
+#        define CURL_FORMAT_CURL_OFF_TU "lu"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    39
 
+#        define CURL_FORMAT_OFF_T       "%ld"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    40
 
+#        define CURL_SUFFIX_CURL_OFF_T L
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    41
 
+#        define CURL_SUFFIX_CURL_OFF_TU UL
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    42
 
+#     endif
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    43
 
+#  endif
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    44
 
+
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    45
 
+/* ===================================== */
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    46
 
 /*    KEEP MSVC THE PENULTIMATE ENTRY    */
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    47
 
 /* ===================================== */
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    48
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    49
 
@@ -527,6 +566,40 @@
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    50
 
 /* ===================================== */
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    51
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    52
 
 #elif defined(__GNUC__)
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    53
 
+#  if defined(sun) || defined(__sun) || defined(__sun__)
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    54
 
+#  include <stdint.h>
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    55
 
+#  include <sys/types.h>
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    56
 
+#  include <sys/socket.h>
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    57
 
+#  define CURL_TYPEOF_CURL_OFF_T off_t
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    58
 
+#  define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    59
 
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    60
 
+#  if defined(__x86_64__) || defined(__sparcv9)
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    61
 
+#     define CURL_SIZEOF_CURL_OFF_T 8
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    62
 
+#     define CURL_SIZEOF_LONG 8
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    63
 
+#     define CURL_FORMAT_CURL_OFF_T  "ld"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    64
 
+#     define CURL_FORMAT_CURL_OFF_TU "lu"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    65
 
+#     define CURL_FORMAT_OFF_T       "%ld"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    66
 
+#     define CURL_SUFFIX_CURL_OFF_T L
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    67
 
+#     define CURL_SUFFIX_CURL_OFF_TU UL
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    68
 
+#  else /* (__i386__) || (__sparc) */
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    69
 
+#     define CURL_SIZEOF_LONG 4
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    70
 
+#     if _FILE_OFFSET_BITS == 64 && _LARGEFILE_SOURCE != 0
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    71
 
+#        define CURL_SIZEOF_CURL_OFF_T 8
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    72
 
+#        define CURL_FORMAT_CURL_OFF_T  "lld"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    73
 
+#        define CURL_FORMAT_CURL_OFF_TU "llu"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    74
 
+#        define CURL_FORMAT_OFF_T       "%lld"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    75
 
+#        define CURL_SUFFIX_CURL_OFF_T LL
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    76
 
+#        define CURL_SUFFIX_CURL_OFF_TU ULL
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    77
 
+#    else
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    78
 
+#        define CURL_SIZEOF_CURL_OFF_T 4
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    79
 
+#        define CURL_FORMAT_CURL_OFF_T  "ld"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    80
 
+#        define CURL_FORMAT_CURL_OFF_TU "lu"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    81
 
+#        define CURL_FORMAT_OFF_T       "%ld"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    82
 
+#        define CURL_SUFFIX_CURL_OFF_T L
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    83
 
+#        define CURL_SUFFIX_CURL_OFF_TU UL
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    84
 
+#     endif
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    85
 
+#  endif
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    86
 
+#  else /* !((sun) || (__sun) || (__sun__)) */
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    87
 
 #  if defined(__i386__) || defined(__ppc__)
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    88
 
 #    define CURL_SIZEOF_LONG           4
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    89
 
 #    define CURL_TYPEOF_CURL_OFF_T     long long
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    90
 
@@ -550,6 +623,7 @@
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    91
 
 #  define CURL_SIZEOF_CURL_SOCKLEN_T 4
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    92
 
 #  define CURL_PULL_SYS_TYPES_H      1
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    93
 
 #  define CURL_PULL_SYS_SOCKET_H     1
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    94
 
+#  endif /* ((sun) || (__sun) || (__sun__)) */
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    95
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    96
 
 #else
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    97
 
 #  error "Unknown non-configure build target!"
upstream/oracle/userland-gate