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.

6 files changed, 16 insertions, 30 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 70245a0804e..7f647f1abaf 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -173,7 +173,6 @@ IS_ANY_SEP
 IS_DIRECTORY_SEP
 LINKER
 LINUX_VERSION_CODE
-LISP_FLOAT_TYPE
 LNOFLSH
 LOCALTIME_CACHE
 MAIL_USE_FLOCK
diff --git a/admin/ChangeLog b/admin/ChangeLog
index d983bb0229c..6dd1ecc08b9 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * CPP-DEFINES (LISP_FLOAT_TYPE): Remove, obsolete.
+
 2012-06-26  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * coccinelle/build_string.cocci: Semantic patch
diff --git a/nt/ChangeLog b/nt/ChangeLog
index b3bf4a47f06..135326ee585 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * 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.
+
 2012-06-30  Glenn Morris  <rgm@gnu.org>
 
         * 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/>.  */
 /* These are all defined in the top-level Makefile by configure.
    They're here only for reference.  */
 
-/* Define LISP_FLOAT_TYPE if you want emacs to support floating-point
-   numbers. */
-#undef LISP_FLOAT_TYPE
-
 /* Define GNU_MALLOC if you want to use the GNU memory allocator. */
 #define GNU_MALLOC
 
@@ -58,9 +54,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define if using an X toolkit.  */
 #undef USE_X_TOOLKIT
 
-/* Define this if you're using XFree386.  */
-#undef HAVE_XFREE386
-
 /* Define this if you have Motif 2.1 or newer.  */
 #undef HAVE_MOTIF_2_1
 
@@ -84,10 +77,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define HAVE_MOUSE
 #endif
 
-/* Define USE_TEXT_PROPERTIES to support visual and other properties
-   on text. */
-#define USE_TEXT_PROPERTIES
-
 /* Define USER_FULL_NAME to return a string
    that is the user's full name.
    It can assume that the variable `pw'
@@ -112,8 +101,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef KERBEROS
 /* Define to use Kerberos 5 instead of Kerberos 4 */
 #undef KERBEROS5
-/* Define to support GSS-API in addition to (or instead of) Kerberos */
-#undef GSSAPI
 
 /* Define to support using a Hesiod database to find the POP server.  */
 #undef HESIOD
@@ -138,7 +125,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef HAVE_LIBPTHREADS
 #undef HAVE_LIBRESOLV
 #undef HAVE_LIBXMU
-#undef HAVE_LIBINTL
 
 /* movemail Kerberos support */
 /* libraries */
@@ -159,11 +145,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef HAVE_KERBEROS_KRB_H
 #undef HAVE_COM_ERR_H
 
-/* GSS-API libraries and headers */
-#undef HAVE_LIBGSSAPI_KRB5
-#undef HAVE_LIBGSSAPI
-#undef HAVE_GSSAPI_H
-
 /* Mail-file locking */
 #undef HAVE_LIBMAIL
 #undef HAVE_MAILLOCK_H
@@ -200,7 +181,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #undef CRAY_STACKSEG_END
 
-#undef HAVE_LIBXBSD
 #undef HAVE_XRMSETDATABASE
 #undef HAVE_XSCREENRESOURCESTRING
 #undef HAVE_XSCREENNUMBEROFSCREEN
@@ -209,10 +189,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef HAVE_RMDIR
 #undef HAVE_RANDOM
 #undef HAVE_LRAND48
-#undef HAVE_MEMCPY
-#undef HAVE_MEMMOVE
-#undef HAVE_MEMSET
-#undef HAVE_MEMCMP
 #undef HAVE_LOGB
 #undef HAVE_FREXP
 #undef HAVE_FMOD
diff --git a/src/ChangeLog b/src/ChangeLog
index f8babe78cc1..ba9afdc7efc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * s/ms-w32.h (LISP_FLOAT_TYPE, HAVE_MEMCMP, HAVE_MEMCPY)
+        (HAVE_MEMMOVE, HAVE_MEMSET): Don't set, obsolete.
+
 2012-07-04  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * buffer.c (init_buffer_once): Fix initialization of
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 3a95bffadb8..f3d8b5ec472 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -105,7 +105,6 @@ struct sigaction {
 #endif
 
 #define HAVE_SOUND  1
-#define LISP_FLOAT_TYPE 1
 
 #define HAVE_SYS_TIMEB_H 1
 #define HAVE_SYS_TIME_H 1
@@ -133,10 +132,6 @@ struct sigaction {
 #define HAVE_RANDOM 1
 #undef  HAVE_SYSINFO
 #undef  HAVE_LRAND48
-#define HAVE_MEMCMP 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMSET 1
 #define HAVE_LOGB 1
 #define HAVE_FREXP 1
 #define HAVE_FMOD 1