pgpool2.git / summary / log / commit / refs

commit    1aebf4c19f866a1278081861fa0dd14ac2025f2c
Author:   Yoshiyuki Asaba <y-asaba at pgfoundry.org>
Date:     Thu Nov 01 10:14:46 2007 +0000

    Fix compile error with SUN's cc.


 Makefile.am          |  2 +-
 configure.in         | 37 +++++++++++++++++++++++++++++++++++++
 parser/Makefile.am   |  2 +-
 pcp/Makefile.am      |  2 +-
 pool_process_query.c |  2 +-
 5 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 60a7323f0..16f01fe4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ DEFS = @DEFS@ \
 sysconf_DATA = pgpool.conf.sample pcp.conf.sample pool_hba.conf.sample
 pkgdata_DATA = sql/system_db.sql sample/pgpool.pam
 
-AM_CPPFLAGS = -Wall -Wmissing-prototypes -Wmissing-declarations -D_GNU_SOURCE -I @PGSQL_INCLUDE_DIR@
+AM_CPPFLAGS = -D_GNU_SOURCE -I @PGSQL_INCLUDE_DIR@
 
 pgpool_LDADD = -L@PGSQL_LIB_DIR@ -lpq parser/libsql-parser.a pcp/libpcp.la parser/nodes.o
 if enable_rpath
diff --git a/configure.in b/configure.in
index 06c077ffe..a12eca838 100644
--- a/configure.in
+++ b/configure.in
@@ -11,6 +11,43 @@ AC_PROG_LIBTOOL
 AM_PROG_LEX
 AC_PROG_YACC
 
+dnl Check compiler option
+dnl check -Wall option
+OLD_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Wall"
+AC_MSG_CHECKING(for -Wall option)
+AC_CACHE_VAL(ac_cv_wall,
+  AC_TRY_COMPILE([], [char a;], ac_cv_wall=yes, ac_cv_wall=no))
+echo $ac_cv_wall
+if test $ac_cv_wall = no; then
+   CFLAGS=$OLD_CFLAGS
+fi
+
+dnl check -Wmissing-prototypes
+OLD_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Wmissing-prototypes"
+AC_MSG_CHECKING(for -Wmissing-prototypes option)
+AC_CACHE_VAL(ac_cv_wmissing_prototypes,
+  AC_TRY_COMPILE([], [char a;], ac_cv_wmissing_prototypes=yes,
+  ac_cv_wmissing_prototypes=no))
+echo $ac_cv_wmissing_prototypes
+if test $ac_cv_wmissing_prototypes = no; then
+   CFLAGS=$OLD_CFLAGS
+fi
+
+
+dnl check -Wmissing-prototypes
+OLD_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Wmissing-declarations"
+AC_MSG_CHECKING(for -Wmissing-declarations option)
+AC_CACHE_VAL(ac_cv_wmissing_declarations,
+  AC_TRY_COMPILE([], [char a;], ac_cv_wmissing_declarations=yes,
+  ac_cv_wmissing_declarations=no))
+echo $ac_cv_wmissing_declarations
+if test $ac_cv_wmissing_declarations = no; then
+   CFLAGS=$OLD_CFLAGS
+fi
+
 dnl Checks for libraries.
 AC_CHECK_LIB(m,        main)
 AC_CHECK_LIB(nsl,      main)
diff --git a/parser/Makefile.am b/parser/Makefile.am
index 8ef7bef1c..d44a740b3 100644
--- a/parser/Makefile.am
+++ b/parser/Makefile.am
@@ -4,7 +4,7 @@ libsql_parser_a_SOURCES = gram.y gramparse.h list.c makefuncs.c makefuncs.h memn
 
 EXTRA_DIST = scan.c scan.l
 
-AM_CPPFLAGS = -pg -Wall -Wmissing-prototypes -Wmissing-declarations -D_GNU_SOURCE -I .. -I @PGSQL_INCLUDE_DIR@
+AM_CPPFLAGS = -D_GNU_SOURCE -I .. -I @PGSQL_INCLUDE_DIR@
 
 AM_YFLAGS = -d
 
diff --git a/pcp/Makefile.am b/pcp/Makefile.am
index 88f752601..bf2ca5892 100644
--- a/pcp/Makefile.am
+++ b/pcp/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -Wall -Wmissing-prototypes -Wmissing-declarations -D_GNU_SOURCE -I .. -I @PGSQL_INCLUDE_DIR@
+AM_CPPFLAGS = -D_GNU_SOURCE -I .. -I @PGSQL_INCLUDE_DIR@
 
 lib_LTLIBRARIES = libpcp.la
 libpcp_la_SOURCES = pcp.h ../pool_type.h md5.h pcp.c pcp_stream.h pcp_stream.c pcp_error.c md5.c
diff --git a/pool_process_query.c b/pool_process_query.c
index d5fe2e4b8..e88a9445a 100644
--- a/pool_process_query.c
+++ b/pool_process_query.c
@@ -3016,7 +3016,7 @@ static void process_reporting(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *b
 	int len;
 	short colnum;
 
-	static char nullmap[2] = {0xff, 0xff};
+	static unsigned char nullmap[2] = {0xff, 0xff};
 	int nbytes = (num_fields + 7)/8;
 
 #define POOLCONFIG_MAXNAMELEN 32


[parent: d668b0cf639e]