X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=acconfig.h;h=dd219f8bee733fde6b80ab5e92809f14d0f5ef61;hb=4314e0e5cff48bb005b73ef4a028686bde357b3a;hp=f78514cf08941224056b3e3a8aca1fb307236c1e;hpb=20229daf9424416db8579fc805ed489f3c7c5e6c;p=lyx.git

diff --git a/acconfig.h b/acconfig.h
index f78514cf08..dd219f8bee 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -17,32 +17,13 @@
 
 @TOP@
 
-/* Define on SunOS 4 and SCO, were some functions are missing from the headers */
-#undef BROKEN_HEADERS
-
-/* Define if you want debugging turned on as default. */
-#undef DEBUG_AS_DEFAULT
-
-/* Define if you are building a development version of LyX */
-#undef DEVEL_VERSION
-
 /* Define to 1 if NLS is requested.  */
 #undef ENABLE_NLS
 
-/* Define to nothing if your compiler does not understand the
-   `explicit' directive */
-#undef explicit
-
 /* 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 stl_string_fwd.h to be used with #include,
-  NOTE: Do not set it to <stl_string_fwd.h> as that will find the LyX
-  	supplied version of the header.
-  e.g. <../include/stl_string_fwd.h> */
-#undef STL_STRING_FWD_H_LOCATION
-
 /* Define if your locale.h file contains LC_MESSAGES.  */
 #undef HAVE_LC_MESSAGES
 
@@ -55,47 +36,28 @@
 /* Define as 1 if you have the stpcopy function */
 #undef HAVE_STPCPY
 
-/*
-/* Define if the bool type is known to your compiler */
-#undef HAVE_bool
-*/
+/* define this to the location of xpm.h to be used with #include,
+  e.g. <xpm.h> */
+#undef XPM_H_LOCATION
 
-/* Define to the name of the distribution.  */
-#undef PACKAGE
+#undef HAVE_LIBSM
 
-/* You might want to define TWO_COLOR_ICONS if you want to spare
- your colormap.  This will use monochrome icons instead of colored
- ones. */
-#undef TWO_COLOR_ICONS
+#undef USE_PSPELL
 
-/* Define to the version of the distribution.  */
-#undef VERSION
+/* Define as 1 if the MKSTEMP function is declared */
+#undef HAVE_DECL_MKSTEMP
 
-/* Define this if you want to see the #warning directives put here and
-   there by the developpers to get attention */
-#undef WITH_WARNINGS
+/* Define if you have the function prototype for snprintf().  */
+#undef HAVE_DECL_SNPRINTF
 
-/* define this to the location of xpm.h to be used with #include,
-  e.g. <xpm.h> */
-#undef XPM_H_LOCATION
+/* Define if you have the function prototype for vsnprintf().  */
+#undef HAVE_DECL_VSNPRINTF
 
 @BOTTOM@ 
 
 /************************************************************ 
  ** You should not need to change anything beyond this point */
 
-/* even though -ansi might have been specified for gcc, we want all
-  usual prototypes.  */
-#ifdef __STRICT_ANSI__
-/**/#undef __STRICT_ANSI__
-#endif
-
-#ifdef HAVE_MEMSET
-#define BZERO(a,b)      memset(a,0,b)
-#else
-#define BZERO(a,b)      bzero(a,b)
-#endif
-
 #ifndef HAVE_STRCHR
 #define strchr(a,b)     index(a,b)
 #endif
@@ -115,6 +77,15 @@ char * strerror(int n);
 #include "broken_headers.h"
 #endif
 
+#ifdef HAVE_MKSTEMP
+#ifndef HAVE_DECL_MKSTEMP
+#if defined (__cplusplus)
+extern "C"
+#endif
+int mkstemp(char*);
+#endif
+#endif
+
 /* C++ always support the keyword `inline' */
 #if defined inline && defined __cplusplus
 /**/#undef inline