From 0c0a1763707235164825bd38e063c354005b2a21 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Sat, 28 Oct 2000 22:53:17 +0000
Subject: [PATCH] As we don't use struct dirent, the #define SYSV_DIRENT is
 useless.  If we every do need it we'd better use AC_HEADER_DIRENT from
 Autoconf.

#define NO_EMPTY_STMTS is completely unused.
---
 src/include/libpq/libpq-fs.h | 14 +-------------
 src/include/port/irix5.h     |  2 --
 src/include/port/sco.h       |  4 ----
 src/include/port/solaris.h   |  4 +---
 src/include/port/svr4.h      |  2 --
 src/include/port/univel.h    |  2 --
 src/include/port/unixware.h  |  1 -
 7 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/include/libpq/libpq-fs.h b/src/include/libpq/libpq-fs.h
index 1d7839f03d1..a7e1ed7974d 100644
--- a/src/include/libpq/libpq-fs.h
+++ b/src/include/libpq/libpq-fs.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-fs.h,v 1.9 2000/01/26 05:58:12 momjian Exp $
+ * $Id: libpq-fs.h,v 1.10 2000/10/28 22:53:15 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,18 +28,6 @@ struct pgdirent
 	char		d_name[MAXNAMLEN + 1];
 };
 
-/*
- * SysV struct dirent doesn't have d_namlen.
- * This counts on d_name being last, which is moderately safe (ha) since
- * it's the variable-length part of the structure.
- */
-#ifdef SYSV_DIRENT
-#define D_NAMLEN(dp) \
-		((dp)->d_reclen - offsetof(struct dirent, d_name[0]))
-#else							/* SYSV_DIRENT */
-#define D_NAMLEN(dp) \
-		((dp)->d_namlen)
-#endif	 /* SYSV_DIRENT */
 
 /* for stat(2) */
 #ifndef S_IRUSR
diff --git a/src/include/port/irix5.h b/src/include/port/irix5.h
index 760cce86777..8451ee95d8a 100644
--- a/src/include/port/irix5.h
+++ b/src/include/port/irix5.h
@@ -1,5 +1,3 @@
 #define USE_POSIX_TIME
-#define NO_EMPTY_STMTS
-#define SYSV_DIRENT
 #define HAS_TEST_AND_SET
 typedef unsigned long slock_t;
diff --git a/src/include/port/sco.h b/src/include/port/sco.h
index 7a0e7556095..2b1187e7ea1 100644
--- a/src/include/port/sco.h
+++ b/src/include/port/sco.h
@@ -5,8 +5,6 @@
 #define DISABLE_COMPLEX_MACRO
 
 #define USE_POSIX_TIME
-#define NO_EMPTY_STMTS
-#define SYSV_DIRENT
 
 #define HAS_TEST_AND_SET
 #define NEED_I386_TAS_ASM
@@ -15,8 +13,6 @@
 
 typedef unsigned char slock_t;
 
-#define DISABLE_COMPLEX_MACRO
-
 /***************************************************************
  * The following include will get the needed prototype for the
  * strcasecmp() function.
diff --git a/src/include/port/solaris.h b/src/include/port/solaris.h
index 83e3d6f8c15..388e9f8b412 100644
--- a/src/include/port/solaris.h
+++ b/src/include/port/solaris.h
@@ -1,8 +1,6 @@
-/* $Header: /cvsroot/pgsql/src/include/port/solaris.h,v 1.1 2000/10/10 21:22:26 petere Exp $ */
+/* $Header: /cvsroot/pgsql/src/include/port/solaris.h,v 1.2 2000/10/28 22:53:17 petere Exp $ */
 
 #define USE_POSIX_TIME
-#define NO_EMPTY_STMTS
-#define SYSV_DIRENT
 #define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
 
diff --git a/src/include/port/svr4.h b/src/include/port/svr4.h
index 67646898d54..b6ca301e996 100644
--- a/src/include/port/svr4.h
+++ b/src/include/port/svr4.h
@@ -1,6 +1,4 @@
 #define USE_POSIX_TIME
-#define NO_EMPTY_STMTS
-#define SYSV_DIRENT
 
 #ifndef			BYTE_ORDER
 #ifdef			MIPSEB
diff --git a/src/include/port/univel.h b/src/include/port/univel.h
index 91ff2c6b362..4f9853d52b6 100644
--- a/src/include/port/univel.h
+++ b/src/include/port/univel.h
@@ -1,6 +1,4 @@
 #define USE_POSIX_TIME
-#define NO_EMPTY_STMTS
-#define SYSV_DIRENT
 
 #define HAS_TEST_AND_SET
 #define NEED_I386_TAS_ASM
diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h
index 06ee4e4da76..00fe4501c22 100644
--- a/src/include/port/unixware.h
+++ b/src/include/port/unixware.h
@@ -1,5 +1,4 @@
 #define USE_POSIX_TIME
-#define SYSV_DIRENT
 
 #define HAS_TEST_AND_SET
 #define NEED_I386_TAS_ASM
-- 
2.39.5