X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=acconfig.h;h=229650fe3bbdffc77467423759ba4e7c1b3d7d0c;hb=907671d259e4f04a0493b293b35a0ce384b094e8;hp=4d9f4e8ae6c92d3b9fe95710e725c6a1ff1cc489;hpb=4c9dc6c513d03e0aff1f3e1655d57fa7e46b1274;p=lyx.git

diff --git a/acconfig.h b/acconfig.h
index 4d9f4e8ae6..229650fe3b 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,8 +1,8 @@
 /* -*- C++ -*- */
-/* This is the compilation configuration file for LyX. It was generated by 
-   autoconf's configure. You might want to change some of the defaults if 
+/* This is the compilation configuration file for LyX. It was generated by
+   autoconf's configure. You might want to change some of the defaults if
    something goes wrong during the compilation
-   
+
    * This file is part of
    * ======================================================
    *
@@ -18,18 +18,6 @@
 
 @TOP@
 
-/* define this to the location of forms.h to be used with #include,
-  e.g. <forms.h> */
-#undef FORMS_H_LOCATION
-
-/* define this to the location of xpm.h to be used with #include,
-  e.g. <xpm.h> */
-#undef XPM_H_LOCATION
-
-#undef HAVE_LIBSM
-
-#undef USE_PSPELL
-
 /* Define as 1 if the MKSTEMP function is declared */
 #undef HAVE_DECL_MKSTEMP
 
@@ -43,9 +31,9 @@
    <iterator> */
 #undef HAVE_DECL_ISTREAMBUF_ITERATOR
 
-@BOTTOM@ 
+@BOTTOM@
 
-/************************************************************ 
+/************************************************************
  ** You should not need to change anything beyond this point */
 
 #ifndef HAVE_STRCHR
@@ -56,17 +44,6 @@
 #define memmove(a, b, c)  bcopy(b, a, c)
 #endif
 
-#ifndef HAVE_STRERROR
-#if defined (__cplusplus)
-extern "C"
-#endif
-char * strerror(int n);
-#endif
-
-#ifdef BROKEN_HEADERS
-#include "broken_headers.h"
-#endif
-
 #ifdef HAVE_MKSTEMP
 #ifndef HAVE_DECL_MKSTEMP
 #if defined (__cplusplus)
@@ -98,25 +75,22 @@ int mkstemp(char*);
 #endif
 
 #ifdef __EMX__
-#include "os2_defines.h"
-#endif
-
-#ifdef VMS
-#include "vms_defines.h"
+#include "support/os2_defines.h"
 #endif
 
 #if defined(__CYGWIN__) || defined( __CYGWIN32__)
-#include "nt_defines.h"
+#include "support/nt_defines.h"
 #endif
 
 /* Some support for the boost library. */
-#ifndef HAVE_LIMITS
-#define BOOST_NO_LIMITS
-#endif
-
-#ifndef HAVE_SSTREAM
-#define BOOST_NO_STRINGSTREAM
-#endif
+/*
+ * #ifndef HAVE_LIMITS
+ * #define BOOST_NO_LIMITS
+ * #endif
+ *
+ * #ifndef HAVE_SSTREAM
+ * #define BOOST_NO_STRINGSTREAM
+ * #endif
+ */
 
 #endif /* _CONFIG_H */
-