diff --git a/configure b/configure
index e8ea3801df9a62b042ad9c9aefe8ff9c61c9c8d9..60db1f79db262120236e16f05324491deb8e48db 100755
--- a/configure
+++ b/configure
@@ -20845,10 +20845,7 @@ LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
-
-
-
-for ac_func in crypt fls getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul
+for ac_func in crypt fls getopt getrusage inet_aton random rint srandom strerror strlcat strlcpy
do
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/configure.in b/configure.in
index 71e707892298020c8647cb7f321b1993c03024c8..5411f927d377d5e564b1ed59c1214c5938ef59b7 100644
--- a/configure.in
+++ b/configure.in
@@ -1325,7 +1325,7 @@ fi
pgac_save_LIBS="$LIBS"
LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
-AC_REPLACE_FUNCS([crypt fls getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul])
+AC_REPLACE_FUNCS([crypt fls getopt getrusage inet_aton random rint srandom strerror strlcat strlcpy])
case $host_os in
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 813ee678eaee6a00c71cbcff27e10374ceee1aae..6bf865f813b658dc6eed1debb8eed50882426cb6 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -460,9 +460,6 @@
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
/* Define to 1 if you have the `strerror' function. */
#undef HAVE_STRERROR
@@ -484,18 +481,12 @@
/* Define to 1 if you have the `strlcpy' function. */
#undef HAVE_STRLCPY
-/* Define to 1 if you have the `strtol' function. */
-#undef HAVE_STRTOL
-
/* Define to 1 if you have the `strtoll' function. */
#undef HAVE_STRTOLL
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
-/* Define to 1 if you have the `strtoul' function. */
-#undef HAVE_STRTOUL
-
/* Define to 1 if you have the `strtoull' function. */
#undef HAVE_STRTOULL
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index dd109b5762bf5cb11fe24848ccd4a9a4e8dc0d09..137fb32c1c8aac5400b0d2db3bab0d75f6617ba0 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -355,9 +355,6 @@
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
/* Define to 1 if you have the `strerror' function. */
#ifndef HAVE_STRERROR
#define HAVE_STRERROR 1
@@ -375,18 +372,12 @@
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
-/* Define to 1 if you have the `strtol' function. */
-#define HAVE_STRTOL 1
-
/* Define to 1 if you have the `strtoll' function. */
//#define HAVE_STRTOLL 1
/* Define to 1 if you have the `strtoq' function. */
/* #undef HAVE_STRTOQ */
-/* Define to 1 if you have the `strtoul' function. */
-#define HAVE_STRTOUL 1
-
/* Define to 1 if you have the `strtoull' function. */
//#define HAVE_STRTOULL 1
diff --git a/src/include/port.h b/src/include/port.h
index 120e402a762a95d4d868bbfc41b746b024f17635..9f06f1a34d86026d480655105bd41d94a314910c 100644
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -408,10 +408,6 @@ extern double rint(double x);
extern int inet_aton(const char *cp, struct in_addr * addr);
#endif
-#ifndef HAVE_STRDUP
-extern char *strdup(const char *str);
-#endif
-
#if !HAVE_DECL_STRLCAT
extern size_t strlcat(char *dst, const char *src, size_t siz);
#endif
diff --git a/src/port/strdup.c b/src/port/strdup.c
deleted file mode 100644
index ea6716cc0d61959233e19388c6bed80d975d9659..0000000000000000000000000000000000000000
--- a/src/port/strdup.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * strdup.c
- * copies a null-terminated string.
- *
- * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- *
- * IDENTIFICATION
- * src/port/strdup.c
- *
- *-------------------------------------------------------------------------
- */
-
-#include "c.h"
-
-
-char *
-strdup(const char *string)
-{
- char *nstr;
-
- nstr = (char *) malloc(strlen(string) + 1);
- if (nstr)
- strcpy(nstr, string);
- return nstr;
-}
diff --git a/src/port/strtol.c b/src/port/strtol.c
deleted file mode 100644
index ff02028bfbe242c594c62247cb150d36b15e7e67..0000000000000000000000000000000000000000
--- a/src/port/strtol.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * src/port/strtol.c
- *
- *
- * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
- * Portions Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtol.c 5.4 (Berkeley) 2/23/91";
-#endif /* LIBC_SCCS and not lint */
-
-#include "c.h"
-
-#include <limits.h>
-#include <ctype.h>
-
-
-#define const
-
-/*
- * Usage Tip:
- *
- * strtol() doesn't give a unique return value to indicate that errno
- * should be consulted, so in most cases it is best to set errno = 0
- * before calling this function, and then errno != 0 can be tested
- * after the function completes.
- */
-
-/*
- * Convert a string to a long integer.
- *
- * Ignores `locale' stuff. Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-long
-strtol(nptr, endptr, base)
-const char *nptr;
-char **endptr;
-int base;
-{
- const char *s = nptr;
- unsigned long acc;
- unsigned char c;
- unsigned long cutoff;
- int neg = 0,
- any,
- cutlim;
-
- /*
- * Skip white space and pick up leading +/- sign if any. If base is 0,
- * allow 0x for hex and 0 for octal, else assume decimal; if base is
- * already 16, allow 0x.
- */
- do
- {
- c = *s++;
- } while (isspace(c));
- if (c == '-')
- {
- neg = 1;
- c = *s++;
- }
- else if (c == '+')
- c = *s++;
- if ((base == 0 || base == 16) &&
- c == '0' && (*s == 'x' || *s == 'X'))
- {
- c = s[1];
- s += 2;
- base = 16;
- }
- if (base == 0)
- base = c == '0' ? 8 : 10;
-
- /*
- * Compute the cutoff value between legal numbers and illegal numbers.
- * That is the largest legal value, divided by the base. An input number
- * that is greater than this value, if followed by a legal input
- * character, is too big. One that is equal to this value may be valid or
- * not; the limit between valid and invalid numbers is then based on the
- * last digit. For instance, if the range for longs is
- * [-2147483648..2147483647] and the input base is 10, cutoff will be set
- * to 214748364 and cutlim to either 7 (neg==0) or 8 (neg==1), meaning
- * that if we have accumulated a value > 214748364, or equal but the next
- * digit is > 7 (or 8), the number is too big, and we will return a range
- * error.
- *
- * Set any if any `digits' consumed; make it negative to indicate
- * overflow.
- */
- cutoff = neg ? -(unsigned long) LONG_MIN : LONG_MAX;
- cutlim = cutoff % (unsigned long) base;
- cutoff /= (unsigned long) base;
- for (acc = 0, any = 0;; c = *s++)
- {
- if (isdigit(c))
- c -= '0';
- else if (isalpha(c))
- c -= isupper(c) ? 'A' - 10 : 'a' - 10;
- else
- break;
- if ((int) c >= base)
- break;
- if (any < 0 || acc > cutoff || acc == cutoff && (int) c > cutlim)
- any = -1;
- else
- {
- any = 1;
- acc *= base;
- acc += c;
- }
- }
- if (any < 0)
- {
- acc = neg ? LONG_MIN : LONG_MAX;
- errno = ERANGE;
- }
- else if (neg)
- acc = -acc;
- if (endptr != 0)
- *endptr = any ? s - 1 : (char *) nptr;
- return acc;
-}
diff --git a/src/port/strtoul.c b/src/port/strtoul.c
deleted file mode 100644
index c9ec156ad15e5a7cd7e2ddc1e8dde4804dd59a7a..0000000000000000000000000000000000000000
--- a/src/port/strtoul.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * src/port/strtoul.c
- *
- *
- * Copyright (c) 1990, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include "c.h"
-
-#include <limits.h>
-#include <ctype.h>
-
-
-/*
- * Convert a string to an unsigned long integer.
- *
- * Ignores `locale' stuff. Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-unsigned long
-strtoul(nptr, endptr, base)
-const char *nptr;
-char **endptr;
-register int base;
-{
- register const char *s = nptr;
- register unsigned long acc;
- register unsigned char c;
- register unsigned long cutoff;
- register int neg = 0,
- any,
- cutlim;
-
- /*
- * See strtol for comments as to the logic used.
- */
- do
- {
- c = *s++;
- } while (isspace(c));
- if (c == '-')
- {
- neg = 1;
- c = *s++;
- }
- else if (c == '+')
- c = *s++;
- if ((base == 0 || base == 16) &&
- c == '0' && (*s == 'x' || *s == 'X'))
- {
- c = s[1];
- s += 2;
- base = 16;
- }
- if (base == 0)
- base = c == '0' ? 8 : 10;
- cutoff = (unsigned long) ULONG_MAX / (unsigned long) base;
- cutlim = (unsigned long) ULONG_MAX % (unsigned long) base;
- for (acc = 0, any = 0;; c = *s++)
- {
- if (!isascii(c))
- break;
- if (isdigit(c))
- c -= '0';
- else if (isalpha(c))
- c -= isupper(c) ? 'A' - 10 : 'a' - 10;
- else
- break;
- if ((int) c >= base)
- break;
- if (any < 0 || acc > cutoff || (acc == cutoff && (int) c > cutlim))
- any = -1;
- else
- {
- any = 1;
- acc *= base;
- acc += c;
- }
- }
- if (any < 0)
- {
- acc = ULONG_MAX;
- errno = ERANGE;
- }
- else if (neg)
- acc = -acc;
- if (endptr != 0)
- *endptr = (char *) (any ? s - 1 : nptr);
- return acc;
-}