diff options
| author | Joe Orton <jorton@apache.org> | 2002-11-14 18:30:02 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2002-11-14 18:30:02 +0000 |
| commit | adfb9f8cb24206940ec6c03498699d65848b14ec (patch) | |
| tree | ef81090ebded17ccaaa554bd912d138421b3ab04 | |
| parent | d96e71caf3fcfd698c604b43092a4f8144b19a38 (diff) | |
| download | apr-adfb9f8cb24206940ec6c03498699d65848b14ec.tar.gz | |
Have APR_CHECK_SIZEOF_EXTENDED and APR_CHECK_DEFINE pass the third
argument to AC_DEFINE(_UNQUOTED); remove corresponding lines from
acconfig.h.
(dropping the third argument to APR_CHECK_DEFINE)
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@64028 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | acconfig.h | 18 | ||||
| -rw-r--r-- | build/apr_common.m4 | 6 |
2 files changed, 3 insertions, 21 deletions
diff --git a/acconfig.h b/acconfig.h index ae91a49c3..3143dd620 100644 --- a/acconfig.h +++ b/acconfig.h @@ -4,15 +4,9 @@ @TOP@ /* Various #defines we need to know about */ -#undef HAVE_LOCK_EX -#undef HAVE_F_SETLK -#undef HAVE_SEM_UNDO -#undef HAVE_PTHREAD_PROCESS_SHARED #undef DEV_RANDOM #undef EGD_DEFAULT_SOCKET #undef HAVE_isascii -#undef HAVE_SO_ACCEPTFILTER -#undef HAVE_MAP_ANON /* Cross process serialization techniques */ #undef USE_FLOCK_SERIALIZE @@ -26,20 +20,8 @@ #undef FCNTL_IS_GLOBAL #undef FLOCK_IS_GLOBAL -#undef SIZEOF_SSIZE_T -#undef SIZEOF_SIZE_T -#undef SIZEOF_OFF_T -#undef SIZEOF_PID_T - #undef HAVE_INT64_C -/* BeOS specific flag */ -#undef HAVE_BONE_VERSION - -/* Does this system have a corkable TCP? */ -#undef HAVE_TCP_CORK -#undef HAVE_TCP_NOPUSH - @BOTTOM@ /* Make sure we have ssize_t defined to be something */ diff --git a/build/apr_common.m4 b/build/apr_common.m4 index ba859bc92..963ef9db7 100644 --- a/build/apr_common.m4 +++ b/build/apr_common.m4 @@ -249,7 +249,7 @@ YES_IS_DEFINED dnl -dnl APR_CHECK_DEFINE( symbol, header_file [, description ]) +dnl APR_CHECK_DEFINE(symbol, header_file) dnl AC_DEFUN(APR_CHECK_DEFINE,[ AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[ @@ -261,7 +261,7 @@ YES_IS_DEFINED ], ac_cv_define_$1=yes, ac_cv_define_$1=no) ]) if test "$ac_cv_define_$1" = "yes"; then - AC_DEFINE(HAVE_$1, 1, [$3]) + AC_DEFINE(HAVE_$1, 1, [Define if $1 is defined in $2]) fi ]) @@ -398,7 +398,7 @@ main() }], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$3],,, AC_CV_NAME=$3))])dnl AC_MSG_RESULT($AC_CV_NAME) -AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME) +AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The size of ]$2) undefine([AC_TYPE_NAME])dnl undefine([AC_CV_NAME])dnl ]) |