equal
deleted
inserted
replaced
1 --- include/curl/curlbuild.h 2010-10-12 15:04:32.000000000 -0700 |
1 Various curl build definitions for Solaris for both Studio and Gnu compilers. |
2 +++ include/curl/curlbuild.h 2010-12-02 10:18:42.364070201 -0800 |
2 |
|
3 These changes need to be sent upsteam. |
|
4 |
|
5 --- include/curl/curlbuild.h.orig 2014-09-10 12:10:14.624818524 -0700 |
|
6 +++ include/curl/curlbuild.h 2014-09-10 12:10:08.344835020 -0700 |
3 @@ -496,6 +496,45 @@ |
7 @@ -496,6 +496,45 @@ |
4 # define CURL_SIZEOF_CURL_SOCKLEN_T 4 |
8 # define CURL_SIZEOF_CURL_SOCKLEN_T 4 |
5 |
9 |
6 /* ===================================== */ |
10 /* ===================================== */ |
7 +/* Sun Studio Compilers */ |
11 +/* Sun Studio Compilers */ |
8 +/* ===================================== */ |
12 +/* ===================================== */ |
9 + |
13 + |
10 +#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) |
14 +#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) |
11 +#include <stdint.h> |
15 +#include <stdint.h> |
12 +#include <sys/types.h> |
16 +#include <sys/types.h> |
82 +# define CURL_SUFFIX_CURL_OFF_T L |
86 +# define CURL_SUFFIX_CURL_OFF_T L |
83 +# define CURL_SUFFIX_CURL_OFF_TU UL |
87 +# define CURL_SUFFIX_CURL_OFF_TU UL |
84 +# endif |
88 +# endif |
85 +# endif |
89 +# endif |
86 +# else /* !((sun) || (__sun) || (__sun__)) */ |
90 +# else /* !((sun) || (__sun) || (__sun__)) */ |
87 # if defined(__i386__) || defined(__ppc__) |
91 # if defined(__ILP32__) || \ |
|
92 defined(__i386__) || defined(__ppc__) || defined(__arm__) || defined(__sparc__) |
88 # define CURL_SIZEOF_LONG 4 |
93 # define CURL_SIZEOF_LONG 4 |
89 # define CURL_TYPEOF_CURL_OFF_T long long |
94 @@ -552,6 +625,7 @@ |
90 @@ -550,6 +623,7 @@ |
|
91 # define CURL_SIZEOF_CURL_SOCKLEN_T 4 |
95 # define CURL_SIZEOF_CURL_SOCKLEN_T 4 |
92 # define CURL_PULL_SYS_TYPES_H 1 |
96 # define CURL_PULL_SYS_TYPES_H 1 |
93 # define CURL_PULL_SYS_SOCKET_H 1 |
97 # define CURL_PULL_SYS_SOCKET_H 1 |
94 +# endif /* ((sun) || (__sun) || (__sun__)) */ |
98 +# endif /* ((sun) || (__sun) || (__sun__)) */ |
95 |
99 |