diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2007-02-13 19:00:59 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2007-02-13 19:00:59 +0000 |
| commit | 3b90870bf8c6d16fbea1e20efbe941aa33254214 (patch) | |
| tree | eed95b80c644b5b9084c2c32014935bfa6e5ba0a /usr.sbin | |
| parent | 2d7c522d4c6846b175249c3e13f86a0cd26e8032 (diff) | |
unbreak compile on 64bit systems; no cookie for espie. ok millert
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/httpd/src/Configure | 30 | ||||
| -rw-r--r-- | usr.sbin/httpd/src/include/ap_config_auto.h | 2 |
2 files changed, 7 insertions, 25 deletions
diff --git a/usr.sbin/httpd/src/Configure b/usr.sbin/httpd/src/Configure index b4d02bef2b6..8b9093bb2c2 100644 --- a/usr.sbin/httpd/src/Configure +++ b/usr.sbin/httpd/src/Configure @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: Configure,v 1.25 2007/02/13 00:37:24 espie Exp $ +# $OpenBSD: Configure,v 1.26 2007/02/13 19:00:58 henning Exp $ ## ==================================================================== ## The Apache Software License, Version 1.1 ## @@ -2343,29 +2343,11 @@ fi ## ## Now compare the sizes of off_t to long ## -AP_TYPE_OFF_T=`${SHELL} helpers/TestCompile -r sizeof off_t` -if [ "x$AP_TYPE_OFF_T" = "x" ]; then - AP_TYPE_OFF_T="unknown_off_t" -fi - -AP_TYPE_LONG=`${SHELL} helpers/TestCompile -r sizeof long` -if [ "x$AP_TYPE_LONG" = "x" ]; then - AP_TYPE_LONG="unknown_long" -fi - -if [ "x$AP_TYPE_OFF_T" != "x$AP_TYPE_LONG" ]; then - echo "" >>$AP_CONFIG_AUTO_H - echo "/* determine: is off_t a quad */" >>$AP_CONFIG_AUTO_H - echo "#ifndef AP_OFF_T_IS_QUAD" >>$AP_CONFIG_AUTO_H - echo "#define AP_OFF_T_IS_QUAD 1" >>$AP_CONFIG_AUTO_H - echo "#endif" >>$AP_CONFIG_AUTO_H -else - echo "" >>$AP_CONFIG_AUTO_H - echo "/* determine: is off_t a quad */" >>$AP_CONFIG_AUTO_H - echo "#ifdef AP_OFF_T_IS_QUAD" >>$AP_CONFIG_AUTO_H - echo "#undef AP_OFF_T_IS_QUAD" >>$AP_CONFIG_AUTO_H - echo "#endif" >>$AP_CONFIG_AUTO_H -fi +echo "" >>$AP_CONFIG_AUTO_H +echo "/* sizeof(off_t) == sizeof(quad_t) on OpenBSD */" >>$AP_CONFIG_AUTO_H +echo "#ifndef AP_OFF_T_IS_QUAD" >>$AP_CONFIG_AUTO_H +echo "#define AP_OFF_T_IS_QUAD 1" >>$AP_CONFIG_AUTO_H +echo "#endif" >>$AP_CONFIG_AUTO_H #################################################################### ## Finish building ap_config_auto.h diff --git a/usr.sbin/httpd/src/include/ap_config_auto.h b/usr.sbin/httpd/src/include/ap_config_auto.h index 2311bb802c8..b7cae81d426 100644 --- a/usr.sbin/httpd/src/include/ap_config_auto.h +++ b/usr.sbin/httpd/src/include/ap_config_auto.h @@ -61,7 +61,7 @@ #define HAVE_ISNAN 1 #endif -/* determine: is off_t a quad */ +/* sizeof(off_t) == sizeof(quad_t) on OpenBSD */ #ifndef AP_OFF_T_IS_QUAD #define AP_OFF_T_IS_QUAD 1 #endif |