As we don't use struct dirent, the #define SYSV_DIRENT is useless. If we

petere · petere · commit 0c0a17637072 · 2000-10-28T22:53:17.000Z
every do need it we'd better use AC_HEADER_DIRENT from Autoconf.

#define NO_EMPTY_STMTS is completely unused.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 #define USE_POSIX_TIME
-#define SYSV_DIRENT
 
 #define HAS_TEST_AND_SET
 #define NEED_I386_TAS_ASM

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#define USE_POSIX_TIME`
`2`		`-#define SYSV_DIRENT`
`3`	`2`
`4`	`3`	`#define HAS_TEST_AND_SET`
`5`	`4`	`#define NEED_I386_TAS_ASM`