From 7f5d092223950d6923aec0225bb54d33df65ba98 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 14 Dec 2005 21:09:30 +0000 Subject: Some preprocessors have problems if the # character isn't at position 1. --- acinclude.m4 | 24 ++++++++++++------------ configure.ac | 14 +++++++------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 72c5372d9..c07072ebb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -704,15 +704,15 @@ AC_DEFUN([CURL_FUNC_GETNAMEINFO_ARGTYPES], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([ - #ifdef HAVE_SYS_TYPES_H - #include - #endif - #ifdef HAVE_SYS_SOCKET_H - #include - #endif - #ifdef HAVE_NETDB_H - #include - #endif +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +#ifdef HAVE_NETDB_H +#include +#endif extern int getnameinfo(const struct sockaddr *, $gni_arg2, @@ -725,11 +725,11 @@ AC_DEFUN([CURL_FUNC_GETNAMEINFO_ARGTYPES], [ ],[ int res; - struct sockaddr *sa=NULL; + struct sockaddr *sa=0; $gni_arg2 salen=0; - char *host=NULL; + char *host=0; $gni_arg46 hostlen=0; - char *serv=NULL; + char *serv=0; $gni_arg46 servlen=0; $gni_arg7 flags=0; diff --git a/configure.ac b/configure.ac index 9c67c919d..af7e62d0e 100644 --- a/configure.ac +++ b/configure.ac @@ -1618,13 +1618,13 @@ if test "$ac_cv_func_getnameinfo" = "yes"; then AC_CHECK_DECL(getnameinfo, , AC_DEFINE(HAVE_NO_GETNAMEINFO_PROTO, 1, [Defined if no getnameinfo() prototype available]), - [ - #ifdef HAVE_SYS_SOCKET_H - #include - #endif - #ifdef HAVE_NETDB_H - #include - #endif + [ +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +#ifdef HAVE_NETDB_H +#include +#endif ]) CURL_FUNC_GETNAMEINFO_ARGTYPES fi -- cgit v1.2.3