auto upstream

2 files changed, 1 insertions, 11 deletions

diff --git a/autogen/config.in b/autogen/config.in
index f9d839bc750..f443933bbd9 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -57,9 +57,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef BROKEN_PTY_READ_AFTER_EAGAIN
 
 /* Define if the system is compatible with BSD 4.2. */
-#undef BSD4_2
-
-/* Define if the system is compatible with BSD 4.2. */
 #undef BSD_SYSTEM
 
 /* Define if AH_BOTTOM should change BSD_SYSTEM. */
diff --git a/autogen/configure b/autogen/configure
index 049d3e3d761..c53e3bdbf03 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -15743,7 +15743,6 @@ esac
 
 
 
-
 case $opsys in
   aix4-2)
     $as_echo "#define USG /**/" >>confdefs.h
@@ -15782,9 +15781,7 @@ $as_echo "#define CYGWIN 1" >>confdefs.h
     ;;
 
   darwin)
-        $as_echo "#define BSD4_2 /**/" >>confdefs.h
-
-    $as_echo "#define BSD_SYSTEM /**/" >>confdefs.h
+        $as_echo "#define BSD_SYSTEM /**/" >>confdefs.h
 
 
 $as_echo "#define DARWIN_OS /**/" >>confdefs.h
@@ -15792,16 +15789,12 @@ $as_echo "#define DARWIN_OS /**/" >>confdefs.h
     ;;
 
   freebsd)
-    $as_echo "#define BSD4_2 /**/" >>confdefs.h
-
 
 $as_echo "#define BSD_SYSTEM_AHB 1" >>confdefs.h
 
     ;;
 
   gnu | netbsd | openbsd )
-    $as_echo "#define BSD4_2 /**/" >>confdefs.h
-
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */