Remove from include/config.h:

#if defined(aix)
#define TERMIOS_H_LOCATION <termios.h>
#else
#define TERMIOS_H_LOCATION <sys/termios.h>
#endif

libpq/fe-exec.c modified so that location of termios.h is determined
by whether HAVE_TERMIOS_H is defined or not, in preparation for switch
to configure

diff --git a/src/include/config.h b/src/include/config.h
index b705335..67a40a9 100644 (file)
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -8,19 +8,15 @@
 
 #define BLCKSZ 8192
 
-#if defined(aix)
-#define TERMIOS_H_LOCATION <termios.h>
-#else
-#define TERMIOS_H_LOCATION <sys/termios.h>
-#endif
-
 #if !defined(nextstep)
 #define USE_VALUES_H
 #endif
 
 #define HAVE_MEMMOVE
+#define HAVE_TERMIOS_H
 
 #if defined(aix)
+#  undef HAVE_TERMIOS_H
 #  define CLASS_CONFLICT 
 #  define DISABLE_XOPEN_NLS 
 #  define NEED_ISINF

diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 6eea31d..5e92e4a 100644 (file)
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.27 1997/01/08 23:25:32 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.28 1997/01/24 17:47:33 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,11 @@
 #include "libpq/pqsignal.h"
 #include "libpq-fe.h"
 #include <sys/ioctl.h>
-#include TERMIOS_H_LOCATION
+#ifndef HAVE_TERMIOS_H
+# include <sys/termios.h>
+#else
+# include <termios.h>
+#endif
 
 
 #ifdef TIOCGWINSZ