* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.65 1999/07/17 20:16:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.66 1999/07/19 02:27:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <time.h>
#include <signal.h>
#include <setjmp.h>
-#ifdef __CYGWIN32__
-#include <getopt.h>
-#endif
#define BOOTSTRAP_INCLUDE /* mask out stuff in tcop/tcopprot.h */
#include "postgres.h"
-
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
#include "access/genam.h"
#include "access/heapam.h"
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.114 1999/07/17 20:17:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.115 1999/07/19 02:27:06 momjian Exp $
*
* NOTES
*
*
*-------------------------------------------------------------------------
*/
-#include "postgres.h"
+#include <unistd.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/wait.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <errno.h>
+#include <fcntl.h>
#include <sys/param.h>
+
+#include "postgres.h"
/* moved here to prevent double define */
#ifdef HAVE_NETDB_H
#include <netdb.h>
#endif
-
#ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN 256
#endif
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
-#endif /* !NO_UNISTD_H */
-
-#include <signal.h>
-#include <time.h>
-
-
#ifdef HAVE_LIMITS_H
#include <limits.h>
#else
#include <values.h>
#endif
-#include <sys/wait.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <fcntl.h>
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
-#ifdef __CYGWIN32__
+#ifdef HAVE_GETOPT_H
#include "getopt.h"
#endif
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.125 1999/07/17 20:17:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.126 1999/07/19 02:27:06 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
-#ifdef __CYGWIN32__
+#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
- puts("$Revision: 1.125 $ $Date: 1999/07/17 20:17:51 $\n");
+ puts("$Revision: 1.126 $ $Date: 1999/07/19 02:27:06 $\n");
}
/* ----------------
* This file contains some public functions
* usable for both the backend and the frontend.
* Tatsuo Ishii
- * $Id: common.c,v 1.5 1999/05/25 16:12:41 momjian Exp $ */
+ * $Id: common.c,v 1.6 1999/07/19 02:27:07 momjian Exp $ */
#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
#ifdef WIN32
#include "win32.h"
-#else
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
#endif
-#endif
-
-#include <string.h>
#include "mb/pg_wchar.h"
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.117 1999/07/17 20:18:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.118 1999/07/19 02:27:08 momjian Exp $
*
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
*
#include <termios.h>
#endif
-#ifdef __CYGWIN32__
+#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/pg_id.c,v 1.8 1999/02/13 23:20:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/pg_id.c,v 1.9 1999/07/19 02:27:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <sys/types.h>
-#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#ifdef __CYGWIN32__
+#include <sys/types.h>
+#include <pwd.h>
+
+#include "postgres.h"
+#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.183 1999/07/17 20:18:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.184 1999/07/19 02:27:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "pqsignal.h"
#include "stringutils.h"
#include "psqlHelp.h"
+
#ifndef HAVE_STRDUP
#include "strdup.h"
#endif
+
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
-#ifdef __CYGWIN32__
+
+#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
AC_CHECK_HEADERS(endian.h)
AC_CHECK_HEADERS(float.h)
AC_CHECK_HEADERS(fp_class.h)
+AC_CHECK_HEADERS(getopt.h)
AC_CHECK_HEADERS(history.h)
AC_CHECK_HEADERS(ieeefp.h)
AC_CHECK_HEADERS(limits.h)
/* Set to 1 if you have <fp_class.h> */
#undef HAVE_FP_CLASS_H
+/* Set to 1 if you have <getopt.h> */
+#undef HAVE_GETOPT_H
+
/* Set to 1 if you have <history.h> */
#undef HAVE_HISTORY_H
#define JMP_BUF
#define NEED_SIG_JMP
-#define NO_UNISTD_H
#define USES_WINSOCK
#define NOFILE 100
#ifndef MAXPATHLEN
#include <unistd.h>
#include "postgres.h"
-#ifdef __CYGWIN32__
+#ifdef HAVE_GETOPT_H
#include "getopt.h"
#endif
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.30 1999/07/17 20:18:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.31 1999/07/19 02:27:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
*
*/
+#include <unistd.h>
+
+#include "postgres.h"
#include "libpq-fe.h"
#include "libpq-int.h"
#include "fe-auth.h"
-#include "postgres.h"
#ifdef WIN32
#include "win32.h"
#ifndef MAXHOSTNAMELEN
#include <netdb.h> /* for MAXHOSTNAMELEN on some */
#endif
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
-#endif
#include <pwd.h>
-#endif /* WIN32 */
+#endif
#ifdef HAVE_CRYPT_H
#include <crypt.h>
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.99 1999/07/17 20:18:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.100 1999/07/19 02:27:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "postgres.h"
#include "libpq-fe.h"
#include "libpq-int.h"
#include "fe-auth.h"
-#include "postgres.h"
#ifdef WIN32
#include "win32.h"
#else
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
-#endif
#include <netdb.h>
#include <netinet/tcp.h>
#endif
-#include <fcntl.h>
-#include <errno.h>
-#include <ctype.h> /* for isspace() */
#ifndef HAVE_STRDUP
#include "strdup.h"
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.82 1999/07/17 20:18:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.83 1999/07/19 02:27:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
+#include <unistd.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "postgres.h"
#include "libpq-fe.h"
#include "libpq-int.h"
-#include "postgres.h"
#ifdef WIN32
#include "win32.h"
-#else
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
-#endif
#endif
-#include <errno.h>
-#include <ctype.h>
/* keep this in same order as ExecStatusType in libpq-fe.h */
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.21 1999/07/17 20:18:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.22 1999/07/19 02:27:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
+#include <unistd.h>
+#include <fcntl.h>
+#include <io.h>
+#include <sys/stat.h>
+
+#include "postgres.h"
#include "libpq-fe.h"
#include "libpq-int.h"
-#include "postgres.h"
#ifdef WIN32
#include "win32.h"
-#include <io.h>
-#else
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
#endif
-#endif
-#include <fcntl.h>
-#include <sys/stat.h>
#include "libpq/libpq-fs.h" /* must come after sys/stat.h */
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.26 1999/07/17 20:18:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.27 1999/07/19 02:27:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include "libpq-fe.h"
-#include "libpq-int.h"
+#include <unistd.h>
+#include <sys/time.h>
+#include <errno.h>
+#include <signal.h>
+#include <time.h>
#include "postgres.h"
+#include "libpq-fe.h"
+#include "libpq-int.h"
#include "pqsignal.h"
-#include <errno.h>
-#include <signal.h>
-#include <time.h>
#ifdef WIN32
#include "win32.h"
-#else
-#include <sys/time.h>
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
#endif
-#endif /* WIN32 */
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
* didn't really belong there.
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.24 1999/07/17 20:18:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.25 1999/07/19 02:27:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
+#include <unistd.h>
+#include <signal.h>
+
+#include "postgres.h"
#include "libpq-fe.h"
#include "libpq-int.h"
-#include "postgres.h"
#include "pqsignal.h"
#ifdef WIN32
#include "win32.h"
#else
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
-#endif
#include <sys/ioctl.h>
-#ifndef HAVE_TERMIOS_H
-#include <sys/termios.h>
-#else
+#endif
+
+#ifdef HAVE_TERMIOS_H
#include <termios.h>
+#else
+#include <sys/termios.h>
#endif
-#endif /* WIN32 */
-#include <signal.h>
#ifdef MULTIBYTE
#include "mb/pg_wchar.h"
*/
#define strcasecmp(a,b) stricmp(a,b)
-
-
-#define NO_UNISTD_H
#define SOCKET_SIZE_TYPE int
/*