comparison auto/unix @ 665:0b460e61bdcd default tip

Merge with nginx 1.0.0.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:22:17 +0400
parents 7ea1bba9a4f6
children
comparison
equal deleted inserted replaced
572:06419a2298a9 665:0b460e61bdcd
107 ngx_feature_libs= 107 ngx_feature_libs=
108 ngx_feature_test="char buf[1]; ssize_t n; n = pwrite(1, buf, 1, 0)" 108 ngx_feature_test="char buf[1]; ssize_t n; n = pwrite(1, buf, 1, 0)"
109 . auto/feature 109 . auto/feature
110 110
111 111
112 ngx_feature="strerror_r()" 112 ngx_feature="sys_nerr"
113 ngx_feature_name="NGX_HAVE_STRERROR_R" 113 ngx_feature_name="NGX_SYS_NERR"
114 ngx_feature_run=yes 114 ngx_feature_run=value
115 ngx_feature_incs="#include <string.h>" 115 ngx_feature_incs='#include <stdio.h>'
116 ngx_feature_path= 116 ngx_feature_path=
117 ngx_feature_libs= 117 ngx_feature_libs=
118 ngx_feature_test="char buf[1024]; long n; n = strerror_r(1, buf, 1024); 118 ngx_feature_test='printf("%d", sys_nerr);'
119 if (n < 0 || n > 1024) return 1;" 119 . auto/feature
120 . auto/feature 120
121 121
122 122 if [ $ngx_found = no ]; then
123 # GNU style strerror_r() returns not length, but pointer 123
124 124 # Cygiwn defines _sys_nerr
125 ngx_feature="gnu style strerror_r()" 125 ngx_feature="_sys_nerr"
126 ngx_feature_name="NGX_HAVE_GNU_STRERROR_R" 126 ngx_feature_name="NGX_SYS_NERR"
127 ngx_feature_run=yes 127 ngx_feature_run=value
128 ngx_feature_incs="#include <string.h>" 128 ngx_feature_incs='#include <errno.h>
129 ngx_feature_path= 129 #include <stdio.h>'
130 ngx_feature_libs= 130 ngx_feature_path=
131 ngx_feature_test="char buf[1024]; long n; n = strerror_r(1, buf, 1024); 131 ngx_feature_libs=
132 if (n >= 0 && n < 1024) return 1;" 132 ngx_feature_test='printf("%d", _sys_nerr);'
133 . auto/feature 133 . auto/feature
134 fi
135
136
137 if [ $ngx_found = no ]; then
138
139 # Solaris has no sys_nerr
140 ngx_feature='maximum errno'
141 ngx_feature_name=NGX_SYS_NERR
142 ngx_feature_run=value
143 ngx_feature_incs='#include <errno.h>
144 #include <stdio.h>'
145 ngx_feature_path=
146 ngx_feature_libs=
147 ngx_feature_test='int n;
148 for (n = 1; n < 1000; n++) {
149 errno = 0;
150 strerror(n);
151 if (errno == EINVAL) {
152 printf("%d", n);
153 return 0;
154 }
155 }'
156 . auto/feature
157 fi
134 158
135 159
136 ngx_feature="localtime_r()" 160 ngx_feature="localtime_r()"
137 ngx_feature_name="NGX_HAVE_LOCALTIME_R" 161 ngx_feature_name="NGX_HAVE_LOCALTIME_R"
138 ngx_feature_run=no 162 ngx_feature_run=no