Mercurial > hg > nginx

comparison auto/unix @ 6500:8426275a13fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Compatibility with FreeBSD 2.2.9. Added (RTLD_NOW | RTLD_GLOBAL) to dlopen() test. There is no RTLD_GLOBAL on FreeBSD 2.2.9. Added uint32_t test, with fallback to u_int32_t, similar to uint64_t one. Added fallback to u_int32_t in in_addr_t test. With these changes it is now possible to compile nginx on FreeBSD 2.2.9 with only few minor warnings (assuming -Wno-error).
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 01 Apr 2016 16:38:31 +0300
parents 8f038068f4bc
children 1d0e03db9f8e
comparison
equal deleted inserted replaced
6499:e20bf454e58b 6500:8426275a13fd
258 ngx_feature_name="NGX_HAVE_DLOPEN" 258 ngx_feature_name="NGX_HAVE_DLOPEN"
259 ngx_feature_run=no 259 ngx_feature_run=no
260 ngx_feature_incs="#include <dlfcn.h>" 260 ngx_feature_incs="#include <dlfcn.h>"
261 ngx_feature_path= 261 ngx_feature_path=
262 ngx_feature_libs= 262 ngx_feature_libs=
263 ngx_feature_test="dlopen(NULL, 0); dlsym(NULL, NULL)" 263 ngx_feature_test="dlopen(NULL, RTLD_NOW | RTLD_GLOBAL); dlsym(NULL, NULL)"
264 . auto/feature 264 . auto/feature
265 265
266 266
267 if [ $ngx_found != yes ]; then 267 if [ $ngx_found != yes ]; then
268 268
545 545
546 # POSIX types 546 # POSIX types
547 547
548 NGX_INCLUDE_AUTO_CONFIG_H="#include \"ngx_auto_config.h\"" 548 NGX_INCLUDE_AUTO_CONFIG_H="#include \"ngx_auto_config.h\""
549 549
550 ngx_type="uint32_t"; ngx_types="u_int32_t"; . auto/types/typedef
550 ngx_type="uint64_t"; ngx_types="u_int64_t"; . auto/types/typedef 551 ngx_type="uint64_t"; ngx_types="u_int64_t"; . auto/types/typedef
551 552
552 ngx_type="sig_atomic_t"; ngx_types="int"; . auto/types/typedef 553 ngx_type="sig_atomic_t"; ngx_types="int"; . auto/types/typedef
553 . auto/types/sizeof 554 . auto/types/sizeof
554 ngx_param=NGX_SIG_ATOMIC_T_SIZE; ngx_value=$ngx_size; . auto/types/value 555 ngx_param=NGX_SIG_ATOMIC_T_SIZE; ngx_value=$ngx_size; . auto/types/value
555 556
556 ngx_type="socklen_t"; ngx_types="int"; . auto/types/typedef 557 ngx_type="socklen_t"; ngx_types="int"; . auto/types/typedef
557 558
558 ngx_type="in_addr_t"; ngx_types="uint32_t"; . auto/types/typedef 559 ngx_type="in_addr_t"; ngx_types="uint32_t u_int32_t"; . auto/types/typedef
559 560
560 ngx_type="in_port_t"; ngx_types="u_short"; . auto/types/typedef 561 ngx_type="in_port_t"; ngx_types="u_short"; . auto/types/typedef
561 562
562 ngx_type="rlim_t"; ngx_types="int"; . auto/types/typedef 563 ngx_type="rlim_t"; ngx_types="int"; . auto/types/typedef
563 564