multicol; small stuff

[lyx.git] / src / LString.h

diff --git a/src/LString.h b/src/LString.h
index 25809cba739ad9778241ed418e950b78c39b7638..1e135594b319e992bc4e2ab19cd3ba86af47d77e 100644 (file)
--- a/src/LString.h
+++ b/src/LString.h
@@ -12,14 +12,19 @@
 #ifndef LSTRING_H
 #define LSTRING_H
 
+#if 0
 #ifndef _CONFIG_H
 #error The <config.h> header should always be included before LString.h
 #endif
+#endif
 
 #ifndef USE_INCLUDED_STRING
+
 #include <string>
 using std::string;
+#define STRCONV(STR) STR
 #else
+
 #ifdef __STRING__
 #error The <string> header has been included before LString.h
 #else
@@ -28,5 +33,7 @@ using std::string;
 #include "support/lyxstring.h"
 // using lyx::string;
 typedef lyxstring string;
+#define STRCONV(STR) STR.c_str()
 #endif
+
 #endif