X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=acconfig.h;h=a897db211fafe30bf2166f390badf5a162ba61f6;hb=a858be7332e331e0244e4dba7b0931b6072ffd3d;hp=0dce1c82e404080dbd118277f238ea998da5a641;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git

diff --git a/acconfig.h b/acconfig.h
index 0dce1c82e4..a897db211f 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -76,7 +76,6 @@
   e.g. <xpm.h> */
 #undef XPM_H_LOCATION
 
-
 @BOTTOM@ 
 
 /************************************************************ 
@@ -117,12 +116,15 @@ char * strerror(int n);
 #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"
@@ -137,6 +139,12 @@ char * strerror(int n);
 /**/#undef inline
 #endif
 
+/* C++ always has a good enough `const' */
+#if defined const && defined __cplusplus
+/**/#undef const
+#endif
+
+
 #ifdef __EMX__
 #include "os2_defines.h"
 #endif