From 9232a6d9a7ca8ef3e725899552cfd568463ddcfe Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 19 May 2012 11:04:49 -0700 Subject: [PATCH] Remove unused HAVE_* symbols for functions. * configure.in (AC_CHECK_FUNCS): Remove XSetWMProtocols, getdomainname, mblen (twice), mbrlen (twice), mbsinit, ualarm, getsockopt, setsockopt, mremap, mempcpy. * admin/CPP-DEFINES (HAVE_GETDOMAINNAME): Remove. * msdos/sed2v2.inp (HAVE_MBLEN): Remove. * msdos/sed2x.inp (HAVE_XSETWMPROTOCOLS): Remove. * nt/config.nt (HAVE_GETDOMAINNAME, HAVE_XSETWMPROTOCOLS) (HAVE_GETSOCKOPT, HAVE_SETSOCKOPT): Remove; not needed. * src/s/ms-w32.h (HAVE_GETDOMAINNAME): Remove; not needed. --- ChangeLog | 4 ++++ admin/CPP-DEFINES | 1 - admin/ChangeLog | 2 ++ configure.in | 12 ++++++------ msdos/ChangeLog | 5 +++++ msdos/sed2v2.inp | 2 -- msdos/sed2x.inp | 1 - nt/ChangeLog | 3 +++ nt/config.nt | 4 ---- src/ChangeLog | 2 ++ src/s/ms-w32.h | 1 - 11 files changed, 22 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index c31ab562f35..3ed2fb71a25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-19 Paul Eggert + * configure.in (AC_CHECK_FUNCS): Remove XSetWMProtocols, + getdomainname, mblen (twice), mbrlen (twice), mbsinit, ualarm, + getsockopt, setsockopt, mremap, mempcpy. + * configure.in (machine): Do not set to 'vax', since src/m/vax.h is being removed. (AC_CHECK_FUNCS): Remove ftime. diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 8310d0d96cc..71ba4bf8ece 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -121,7 +121,6 @@ HAVE_FPATHCONF HAVE_FREXP HAVE_FSYNC HAVE_GETCWD -HAVE_GETDOMAINNAME HAVE_GETHOSTNAME HAVE_GETLOADAVG HAVE_GETPAGESIZE diff --git a/admin/ChangeLog b/admin/ChangeLog index deb83a96b50..55504b3d6f8 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,5 +1,7 @@ 2012-05-19 Paul Eggert + * CPP-DEFINES (HAVE_GETDOMAINNAME): Remove. + * CPP-DEFINES (HAVE_FTIME): Remove. 2012-05-02 Glenn Morris diff --git a/configure.in b/configure.in index 4aa28d82e56..87c9a6cd276 100644 --- a/configure.in +++ b/configure.in @@ -1873,7 +1873,7 @@ if test "${HAVE_X11}" = "yes"; then fi AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \ -XScreenNumberOfScreen XSetWMProtocols) +XScreenNumberOfScreen) fi if test "${window_system}" = "x11"; then @@ -2773,15 +2773,15 @@ esac AC_SUBST(BLESSMAIL_TARGET) -AC_CHECK_FUNCS(gethostname getdomainname \ +AC_CHECK_FUNCS(gethostname \ rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \ random lrand48 logb frexp fmod rint cbrt setsid \ strerror fpathconf select euidaccess getpagesize tzset setlocale \ utimes getrlimit setrlimit setpgid getcwd getwd shutdown getaddrinfo \ -__fpending mblen mbrlen mbsinit strsignal setitimer ualarm \ -sendto recvfrom getsockopt setsockopt getsockname getpeername \ -gai_strerror mkstemp getline getdelim mremap fsync sync \ -difftime mempcpy mblen mbrlen posix_memalign \ +__fpending strsignal setitimer \ +sendto recvfrom getsockname getpeername \ +gai_strerror mkstemp getline getdelim fsync sync \ +difftime posix_memalign \ getpwent endpwent getgrent endgrent \ cfmakeraw cfsetspeed copysign __executable_start) diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 603baa978e0..46472373e51 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,8 @@ +2012-05-19 Paul Eggert + + * sed2v2.inp (HAVE_MBLEN): Remove. + * sed2x.inp (HAVE_XSETWMPROTOCOLS): Remove. + 2012-04-21 Eli Zaretskii * sedleim.inp (RUN_EMACS): Replace BUILT_EMACS with EMACS. diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 7c7a4ad6271..06a59513af7 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -46,7 +46,6 @@ /^#undef HAVE_SETRLIMIT *$/s/^.*$/#define HAVE_SETRLIMIT 1/ /^#undef HAVE_GETRUSAGE *$/s/^.*$/#define HAVE_GETRUSAGE 1/ /^#undef HAVE_TM_GMTOFF *$/s/^.*$/#define HAVE_TM_GMTOFF 1/ -/^#undef HAVE_MBLEN *$/s/^.*$/#define HAVE_MBLEN 1/ /^#undef HAVE_STRUCT_TIMEZONE *$/s/^.*$/#define HAVE_STRUCT_TIMEZONE 1/ /^#undef HAVE_SIZE_T *$/s/^.*$/#define HAVE_SIZE_T 1/ /^#undef HAVE_MKSTEMP *$/s/^.*$/#define HAVE_MKSTEMP 1/ @@ -119,4 +118,3 @@ s/^#undef HAVE_STRTOULL *$/#define HAVE_STRTOULL 1/ # might be defined in sys/config.h we include at the top of config.h. /^#undef BSTRING/s|#undef|# undef| /^#undef .*$/s|^.*$|/* & */| - diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp index 159c35fd251..fa920246c96 100644 --- a/msdos/sed2x.inp +++ b/msdos/sed2x.inp @@ -20,6 +20,5 @@ /^#undef HAVE_X11 *$/s/undef/define/ /^#undef HAVE_X_MENU *$/s/undef/define/ /^#undef HAVE_XSCREENNUMBEROFSCREEN *$/s/undef/define/ -/^#undef HAVE_XSETWMPROTOCOLS *$/s/undef/define/ /^#undef HAVE_SELECT *$/s/undef/define/ diff --git a/nt/ChangeLog b/nt/ChangeLog index 22f7bc1d5ea..faf6f80c4c5 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,5 +1,8 @@ 2012-05-19 Paul Eggert + * config.nt (HAVE_GETDOMAINNAME, HAVE_XSETWMPROTOCOLS) + (HAVE_GETSOCKOPT, HAVE_SETSOCKOPT): Remove; not needed. + * config.nt (HAVE_FTIME): Remove undef; not needed. 2012-05-01 Glenn Morris diff --git a/nt/config.nt b/nt/config.nt index 0ae14c93d94..9d933c2d0a0 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -179,7 +179,6 @@ along with GNU Emacs. If not, see . */ #undef GETTIMEOFDAY_ONE_ARGUMENT #endif #undef HAVE_GETHOSTNAME -#undef HAVE_GETDOMAINNAME #undef HAVE_DUP2 #undef HAVE_RENAME #undef HAVE_CLOSEDIR @@ -205,7 +204,6 @@ along with GNU Emacs. If not, see . */ #undef HAVE_XRMSETDATABASE #undef HAVE_XSCREENRESOURCESTRING #undef HAVE_XSCREENNUMBEROFSCREEN -#undef HAVE_XSETWMPROTOCOLS #undef HAVE_MKDIR #undef HAVE_RMDIR @@ -244,8 +242,6 @@ along with GNU Emacs. If not, see . */ #define HAVE_SENDTO 1 #define HAVE_RECVFROM 1 -#define HAVE_GETSOCKOPT 1 -#define HAVE_SETSOCKOPT 1 #define HAVE_GETSOCKNAME 1 #define HAVE_GETPEERNAME 1 #define HAVE_SNPRINTF 1 diff --git a/src/ChangeLog b/src/ChangeLog index 4e648223497..0f1914b6e46 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2012-05-19 Paul Eggert + * s/ms-w32.h (HAVE_GETDOMAINNAME): Remove; not needed. + * m/vax.h: Remove; no longer needed since HAVE_FTIME is being removed. * s/ms-w32.h (HAVE_FTIME): Remove; not needed. diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index 815ab9101f4..63fc2f1f62b 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@ -122,7 +122,6 @@ struct sigaction { #define HAVE_GETTIMEOFDAY 1 #define HAVE_GETHOSTNAME 1 -#undef HAVE_GETDOMAINNAME #define HAVE_DUP2 1 #define HAVE_RENAME 1 #define HAVE_CLOSEDIR 1 -- 2.39.2