aboutsummaryrefslogtreecommitdiff
path: root/src/interfaces
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2000-06-11 11:40:09 +0000
committerPeter Eisentraut <peter_e@gmx.net>2000-06-11 11:40:09 +0000
commit06cd0f1a32b843832298471e92cc1c577f1363a1 (patch)
treef94f7a4ea39288ff268213c93aff15e4d00682c2 /src/interfaces
parentb4182b1327415f2ef2cae6e3795d9f04f578df43 (diff)
downloadpostgresql-06cd0f1a32b843832298471e92cc1c577f1363a1.tar.gz
postgresql-06cd0f1a32b843832298471e92cc1c577f1363a1.zip
Substituted new configure test for types of accept()
Interfaced a lot of the custom tests to the config.cache, in the process made them separate macros and grouped them out into files. Made naming adjustments. Removed a couple of useless/unused configure tests. Disabled C++ by default. C++ is no more special than Perl, Python, and Tcl. And it breaks equally often. :(
Diffstat (limited to 'src/interfaces')
-rw-r--r--src/interfaces/Makefile.in10
-rw-r--r--src/interfaces/libpq/fe-connect.c6
-rw-r--r--src/interfaces/libpq/pqsignal.c6
-rw-r--r--src/interfaces/libpq/win32.h2
4 files changed, 10 insertions, 14 deletions
diff --git a/src/interfaces/Makefile.in b/src/interfaces/Makefile.in
index 549eef42b9f..42ff5e3ed42 100644
--- a/src/interfaces/Makefile.in
+++ b/src/interfaces/Makefile.in
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/interfaces/Attic/Makefile.in,v 1.1 2000/06/10 18:01:48 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/Attic/Makefile.in,v 1.2 2000/06/11 11:39:59 petere Exp $
#
#-------------------------------------------------------------------------
@@ -16,14 +16,14 @@ top_builddir = ../..
USE_TCL = @USE_TCL@
USE_ODBC = @USE_ODBC@
-WITH_CXX = @HAVECXX@
+with_CXX = @with_CXX@
with_perl = @with_perl@
with_python = @with_python@
all install clean dep depend:
$(MAKE) -C libpq $@
$(MAKE) -C ecpg $@
-ifeq ($(WITH_CXX), true)
+ifeq ($(with_CXX), yes)
$(MAKE) -C libpq++ $@
endif
$(MAKE) -C libpgeasy $@
@@ -41,12 +41,8 @@ ifeq ($(USE_ODBC), true)
endif
distclean maintainer-clean: clean
-ifeq ($(with_perl), yes)
-$(MAKE) -C perl5 $@
-endif
-ifeq ($(with_python), yes)
-$(MAKE) -C python $@
-endif
rm -f Makefile \
libpq/Makefile \
ecpg/lib/Makefile \
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 567fd9fd25b..2e190fd8b1d 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.128 2000/05/31 00:28:41 petere Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.129 2000/06/11 11:40:07 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1076,7 +1076,7 @@ keep_going: /* We will come back to here until there
{
case CONNECTION_STARTED:
{
- SOCKET_SIZE_TYPE laddrlen;
+ ACCEPT_TYPE_ARG3 laddrlen;
#ifndef WIN32
int optval;
@@ -1085,7 +1085,7 @@ keep_going: /* We will come back to here until there
char optval;
#endif
- SOCKET_SIZE_TYPE optlen = sizeof(optval);
+ ACCEPT_TYPE_ARG3 optlen = sizeof(optval);
/*
* Write ready, since we've made it here, so the
diff --git a/src/interfaces/libpq/pqsignal.c b/src/interfaces/libpq/pqsignal.c
index 8776a37fe50..651a9140296 100644
--- a/src/interfaces/libpq/pqsignal.c
+++ b/src/interfaces/libpq/pqsignal.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/pqsignal.c,v 1.11 2000/01/26 05:58:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/pqsignal.c,v 1.12 2000/06/11 11:40:07 petere Exp $
*
* NOTES
* This shouldn't be in libpq, but the monitor and some other
@@ -25,7 +25,7 @@
pqsigfunc
pqsignal(int signo, pqsigfunc func)
{
-#if !defined(USE_POSIX_SIGNALS)
+#if !defined(HAVE_POSIX_SIGNALS)
return signal(signo, func);
#else
struct sigaction act,
@@ -39,5 +39,5 @@ pqsignal(int signo, pqsigfunc func)
if (sigaction(signo, &act, &oact) < 0)
return SIG_ERR;
return oact.sa_handler;
-#endif /* !USE_POSIX_SIGNALS */
+#endif /* !HAVE_POSIX_SIGNALS */
}
diff --git a/src/interfaces/libpq/win32.h b/src/interfaces/libpq/win32.h
index 126dd152c06..8079b4b8ed5 100644
--- a/src/interfaces/libpq/win32.h
+++ b/src/interfaces/libpq/win32.h
@@ -6,7 +6,7 @@
#define strcasecmp(a,b) stricmp(a,b)
#define strncasecmp(a,b,c) _strnicmp(a,b,c)
-#define SOCKET_SIZE_TYPE int
+#define ACCEPT_TYPE_ARG3 int
/*
* Some compat functions