Remove separate strdup.h header file; it's redundant with port.h.

tglsfdc · tglsfdc · commit 9ba40653129f · 2006-09-27T15:41:24.000Z
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.92 2006/08/01 18:05:04 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.93 2006/09/27 15:41:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,10 +24,6 @@
 
 #include <ctype.h>
 
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#endif
-
 
 /*
  * Variables for mapping DumpId to DumpableObject
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
@@ -5,7 +5,7 @@
  *	Implements the basic DB functions used by the archiver.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.73 2006/07/18 17:42:00 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.74 2006/09/27 15:41:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,9 +21,6 @@
 #include <termios.h>
 #endif
 
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#endif
 
 static const char *modulename = gettext_noop("archiver (db)");
 
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -12,7 +12,7 @@
  *	by PostgreSQL
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.448 2006/09/22 21:39:57 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.449 2006/09/27 15:41:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,10 +34,6 @@
 #include <termios.h>
 #endif
 
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#endif
-
 #include "getopt_long.h"
 
 #ifndef HAVE_INT_OPTRESET
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.81 2006/07/14 14:52:26 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.82 2006/09/27 15:41:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,9 +19,6 @@
 #ifdef ENABLE_NLS
 #include <locale.h>
 #endif
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#endif
 
 #include "getopt_long.h"
 
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
@@ -34,7 +34,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.80 2006/08/01 18:21:44 momjian Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.81 2006/09/27 15:41:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,10 +43,6 @@
 
 #include <ctype.h>
 
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#endif
-
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
@@ -3,15 +3,12 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.128 2006/08/29 22:48:55 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.129 2006/09/27 15:41:23 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
 
 #include <ctype.h>
-#ifndef HAVE_STRDUP
-#include <strdup.h>
-#endif
 #include <signal.h>
 #ifndef WIN32
 #include <sys/time.h>
diff --git a/src/include/strdup.h b/src/include/strdup.h
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.335 2006/09/15 21:34:23 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.336 2006/09/27 15:41:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,10 +22,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#endif
-
 #include "libpq-fe.h"
 #include "libpq-int.h"
 #include "fe-auth.h"
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.86 2006/09/04 14:57:27 petere Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.87 2006/09/27 15:41:24 tgl Exp $
  *
  * NOTES
  *	  [ Most of these notes are wrong/obsolete, but perhaps not all ]
@@ -109,10 +109,6 @@
 #endif
 #endif
 
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#endif
-
 #ifdef USE_SSL
 #include <openssl/ssl.h>
 #endif   /* USE_SSL */
diff --git a/src/port/strdup.c b/src/port/strdup.c
@@ -8,15 +8,13 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/strdup.c,v 1.11 2006/07/14 04:59:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/strdup.c,v 1.12 2006/09/27 15:41:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "c.h"
 
-#include "strdup.h"
-
 
 char *
 strdup(const char *string)

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.92 2006/08/01 18:05:04 momjian Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.93 2006/09/27 15:41:23 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -24,10 +24,6 @@`
`24`	`24`
`25`	`25`	`#include <ctype.h>`
`26`	`26`
`27`		`-#ifndef HAVE_STRDUP`
`28`		`-#include "strdup.h"`
`29`		`-#endif`
`30`		`-`
`31`	`27`
`32`	`28`	`/*`
`33`	`29`	`* Variables for mapping DumpId to DumpableObject`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.81 2006/07/14 14:52:26 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.82 2006/09/27 15:41:23 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -19,9 +19,6 @@`
`19`	`19`	`#ifdef ENABLE_NLS`
`20`	`20`	`#include <locale.h>`
`21`	`21`	`#endif`
`22`		`-#ifndef HAVE_STRDUP`
`23`		`-#include "strdup.h"`
`24`		`-#endif`
`25`	`22`
`26`	`23`	`#include "getopt_long.h"`
`27`	`24`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`*`
`35`	`35`	`*`
`36`	`36`	`* IDENTIFICATION`
`37`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.80 2006/08/01 18:21:44 momjian Exp $`
	`37`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.81 2006/09/27 15:41:23 tgl Exp $`
`38`	`38`	`*`
`39`	`39`	`*-------------------------------------------------------------------------`
`40`	`40`	`*/`
`@@ -43,10 +43,6 @@`
`43`	`43`
`44`	`44`	`#include <ctype.h>`
`45`	`45`
`46`		`-#ifndef HAVE_STRDUP`
`47`		`-#include "strdup.h"`
`48`		`-#endif`
`49`		`-`
`50`	`46`	`#ifdef HAVE_TERMIOS_H`
`51`	`47`	`#include <termios.h>`
`52`	`48`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.335 2006/09/15 21:34:23 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.336 2006/09/27 15:41:24 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -22,10 +22,6 @@`
`22`	`22`	`#include <time.h>`
`23`	`23`	`#include <unistd.h>`
`24`	`24`
`25`		`-#ifndef HAVE_STRDUP`
`26`		`-#include "strdup.h"`
`27`		`-#endif`
`28`		`-`
`29`	`25`	`#include "libpq-fe.h"`
`30`	`26`	`#include "libpq-int.h"`
`31`	`27`	`#include "fe-auth.h"`
Original file line number	Diff line number	Diff line change
`@@ -8,15 +8,13 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/port/strdup.c,v 1.11 2006/07/14 04:59:30 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/port/strdup.c,v 1.12 2006/09/27 15:41:24 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`15`	`15`
`16`	`16`	`#include "c.h"`
`17`	`17`
`18`		`-#include "strdup.h"`
`19`		`-`
`20`	`18`
`21`	`19`	`char *`
`22`	`20`	`strdup(const char *string)`