diff options
| author | Juanma Barranquero | 2012-07-04 18:46:42 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2012-07-04 18:46:42 +0200 |
| commit | 95f61aa29aa5c38bbcb6f0f67741f0c04d21ba45 (patch) | |
| tree | cc29ce85c85883fad79d6a0c4a3c222eb0bd3366 /nt | |
| parent | d209e2fb19ee0f499bc2e30ea83ce9d99bb9a97c (diff) | |
| download | emacs-95f61aa29aa5c38bbcb6f0f67741f0c04d21ba45.tar.gz emacs-95f61aa29aa5c38bbcb6f0f67741f0c04d21ba45.zip | |
Remove obsolete configuration options (Windows port).
* admin/CPP-DEFINES (LISP_FLOAT_TYPE): Remove, obsolete.
* nt/config.nt (LISP_FLOAT_TYPE, HAVE_XFREE386, USE_TEXT_PROPERTIES)
(GSSAPI, HAVE_LIBINTL, HAVE_LIBGSSAPI_KRB5, HAVE_LIBGSSAPI)
(HAVE_GSSAPI_H, HAVE_LIBXBD, HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET)
(HAVE_MEMCMP): Remove, obsolete.
* src/s/ms-w32.h (LISP_FLOAT_TYPE, HAVE_MEMCMP, HAVE_MEMCPY)
(HAVE_MEMMOVE, HAVE_MEMSET): Don't set, obsolete.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 7 | ||||
| -rw-r--r-- | nt/config.nt | 24 |
2 files changed, 7 insertions, 24 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index b3bf4a47f06..135326ee585 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2012-07-04 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * config.nt (LISP_FLOAT_TYPE, HAVE_XFREE386, USE_TEXT_PROPERTIES) | ||
| 4 | (GSSAPI, HAVE_LIBINTL, HAVE_LIBGSSAPI_KRB5, HAVE_LIBGSSAPI) | ||
| 5 | (HAVE_GSSAPI_H, HAVE_LIBXBD, HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET) | ||
| 6 | (HAVE_MEMCMP): Remove, obsolete. | ||
| 7 | |||
| 1 | 2012-06-30 Glenn Morris <rgm@gnu.org> | 8 | 2012-06-30 Glenn Morris <rgm@gnu.org> |
| 2 | 9 | ||
| 3 | * paths.h (PATH_SITELOADSEARCH): New. | 10 | * paths.h (PATH_SITELOADSEARCH): New. |
diff --git a/nt/config.nt b/nt/config.nt index 93a7f7b57a7..9ceb3549cbe 100644 --- a/nt/config.nt +++ b/nt/config.nt | |||
| @@ -27,10 +27,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 27 | /* These are all defined in the top-level Makefile by configure. | 27 | /* These are all defined in the top-level Makefile by configure. |
| 28 | They're here only for reference. */ | 28 | They're here only for reference. */ |
| 29 | 29 | ||
| 30 | /* Define LISP_FLOAT_TYPE if you want emacs to support floating-point | ||
| 31 | numbers. */ | ||
| 32 | #undef LISP_FLOAT_TYPE | ||
| 33 | |||
| 34 | /* Define GNU_MALLOC if you want to use the GNU memory allocator. */ | 30 | /* Define GNU_MALLOC if you want to use the GNU memory allocator. */ |
| 35 | #define GNU_MALLOC | 31 | #define GNU_MALLOC |
| 36 | 32 | ||
| @@ -58,9 +54,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 58 | /* Define if using an X toolkit. */ | 54 | /* Define if using an X toolkit. */ |
| 59 | #undef USE_X_TOOLKIT | 55 | #undef USE_X_TOOLKIT |
| 60 | 56 | ||
| 61 | /* Define this if you're using XFree386. */ | ||
| 62 | #undef HAVE_XFREE386 | ||
| 63 | |||
| 64 | /* Define this if you have Motif 2.1 or newer. */ | 57 | /* Define this if you have Motif 2.1 or newer. */ |
| 65 | #undef HAVE_MOTIF_2_1 | 58 | #undef HAVE_MOTIF_2_1 |
| 66 | 59 | ||
| @@ -84,10 +77,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 84 | #define HAVE_MOUSE | 77 | #define HAVE_MOUSE |
| 85 | #endif | 78 | #endif |
| 86 | 79 | ||
| 87 | /* Define USE_TEXT_PROPERTIES to support visual and other properties | ||
| 88 | on text. */ | ||
| 89 | #define USE_TEXT_PROPERTIES | ||
| 90 | |||
| 91 | /* Define USER_FULL_NAME to return a string | 80 | /* Define USER_FULL_NAME to return a string |
| 92 | that is the user's full name. | 81 | that is the user's full name. |
| 93 | It can assume that the variable `pw' | 82 | It can assume that the variable `pw' |
| @@ -112,8 +101,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 112 | #undef KERBEROS | 101 | #undef KERBEROS |
| 113 | /* Define to use Kerberos 5 instead of Kerberos 4 */ | 102 | /* Define to use Kerberos 5 instead of Kerberos 4 */ |
| 114 | #undef KERBEROS5 | 103 | #undef KERBEROS5 |
| 115 | /* Define to support GSS-API in addition to (or instead of) Kerberos */ | ||
| 116 | #undef GSSAPI | ||
| 117 | 104 | ||
| 118 | /* Define to support using a Hesiod database to find the POP server. */ | 105 | /* Define to support using a Hesiod database to find the POP server. */ |
| 119 | #undef HESIOD | 106 | #undef HESIOD |
| @@ -138,7 +125,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 138 | #undef HAVE_LIBPTHREADS | 125 | #undef HAVE_LIBPTHREADS |
| 139 | #undef HAVE_LIBRESOLV | 126 | #undef HAVE_LIBRESOLV |
| 140 | #undef HAVE_LIBXMU | 127 | #undef HAVE_LIBXMU |
| 141 | #undef HAVE_LIBINTL | ||
| 142 | 128 | ||
| 143 | /* movemail Kerberos support */ | 129 | /* movemail Kerberos support */ |
| 144 | /* libraries */ | 130 | /* libraries */ |
| @@ -159,11 +145,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 159 | #undef HAVE_KERBEROS_KRB_H | 145 | #undef HAVE_KERBEROS_KRB_H |
| 160 | #undef HAVE_COM_ERR_H | 146 | #undef HAVE_COM_ERR_H |
| 161 | 147 | ||
| 162 | /* GSS-API libraries and headers */ | ||
| 163 | #undef HAVE_LIBGSSAPI_KRB5 | ||
| 164 | #undef HAVE_LIBGSSAPI | ||
| 165 | #undef HAVE_GSSAPI_H | ||
| 166 | |||
| 167 | /* Mail-file locking */ | 148 | /* Mail-file locking */ |
| 168 | #undef HAVE_LIBMAIL | 149 | #undef HAVE_LIBMAIL |
| 169 | #undef HAVE_MAILLOCK_H | 150 | #undef HAVE_MAILLOCK_H |
| @@ -200,7 +181,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 200 | 181 | ||
| 201 | #undef CRAY_STACKSEG_END | 182 | #undef CRAY_STACKSEG_END |
| 202 | 183 | ||
| 203 | #undef HAVE_LIBXBSD | ||
| 204 | #undef HAVE_XRMSETDATABASE | 184 | #undef HAVE_XRMSETDATABASE |
| 205 | #undef HAVE_XSCREENRESOURCESTRING | 185 | #undef HAVE_XSCREENRESOURCESTRING |
| 206 | #undef HAVE_XSCREENNUMBEROFSCREEN | 186 | #undef HAVE_XSCREENNUMBEROFSCREEN |
| @@ -209,10 +189,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 209 | #undef HAVE_RMDIR | 189 | #undef HAVE_RMDIR |
| 210 | #undef HAVE_RANDOM | 190 | #undef HAVE_RANDOM |
| 211 | #undef HAVE_LRAND48 | 191 | #undef HAVE_LRAND48 |
| 212 | #undef HAVE_MEMCPY | ||
| 213 | #undef HAVE_MEMMOVE | ||
| 214 | #undef HAVE_MEMSET | ||
| 215 | #undef HAVE_MEMCMP | ||
| 216 | #undef HAVE_LOGB | 192 | #undef HAVE_LOGB |
| 217 | #undef HAVE_FREXP | 193 | #undef HAVE_FREXP |
| 218 | #undef HAVE_FMOD | 194 | #undef HAVE_FMOD |