diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1997-01-24 17:47:39 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1997-01-24 17:47:39 +0000 |
| commit | cfe18a8e3f24014334f4bfe5bb8583f6baaeb13b (patch) | |
| tree | 2183f3a1b72184a8ac6e345a60836f275f383a8a | |
| parent | 1ac3ea9dcfb698409f571799da7942d9aa8d905e (diff) | |
| download | postgresql-cfe18a8e3f24014334f4bfe5bb8583f6baaeb13b.tar.gz postgresql-cfe18a8e3f24014334f4bfe5bb8583f6baaeb13b.zip | |
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
| -rw-r--r-- | src/include/config.h | 8 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-exec.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/include/config.h b/src/include/config.h index b70533556c3..67a40a95f40 100644 --- 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 6eea31d9995..5e92e4a63d2 100644 --- 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 |