fixes because of SUN CC warnings, bmtable now compiled with C compilator, countChar...

[lyx.git] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index a897db211fafe30bf2166f390badf5a162ba61f6..65a6d81d8145d8e06cffdcdc91823ba3032a41fd 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -17,9 +17,6 @@
 
 @TOP@
 
-/* Define to work around a bug with const handling in gcc 2.7.[012] */
-#undef BROKEN_CONST
-
 /* Define on SunOS 4 and SCO, were some functions are missing from the headers */
 #undef BROKEN_HEADERS
 
@@ -40,6 +37,12 @@
   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> or better yet use an absolute path */
+#undef STL_STRING_FWD_H_LOCATION
+
 /* Define if your locale.h file contains LC_MESSAGES.  */
 #undef HAVE_LC_MESSAGES
 
@@ -52,10 +55,10 @@
 /* Define as 1 if you have the stpcopy function */
 #undef HAVE_STPCPY
 
-/*
+#if 0
 /* Define if the bool type is known to your compiler */
 #undef HAVE_bool
-*/
+#endif
 
 /* Define to the name of the distribution.  */
 #undef PACKAGE
@@ -108,28 +111,6 @@ extern "C"
 char * strerror(int n);
 #endif
 
-/*
-#ifndef HAVE_bool
-#define bool int
-#define true 1
-#define false 0
-#endif
-*/
-
-/*
-#if SIZEOF_VOID_P == SIZEOF_INT
-# define PTR_AS_INT(p) int(p)
-#else
-# define PTR_AS_INT(p) long(p)
-#endif
-*/
-
-/* do we need this anymore?*/
-#ifdef BROKEN_CONST
-#include <string.h>
-#include "broken_const.h"
-#endif  
-
 #ifdef BROKEN_HEADERS
 #include "broken_headers.h"
 #endif
@@ -144,6 +125,16 @@ char * strerror(int n);
 /**/#undef const
 #endif
 
+/* Check on the run if we are using exceptions during this compilation.*/
+#if defined(__sgi) || defined(__GNUC__)
+#  ifdef __EXCEPTIONS
+#    define USING_EXCEPTIONS
+#  endif
+#endif
+
+#if defined(__USLC__) || defined(__SUNPRO_CC) || defined(__COMO__) || defined(__ICL)
+#  define USING_EXCEPTIONS
+#endif
 
 #ifdef __EMX__
 #include "os2_defines.h"