multicol; small stuff

[lyx.git] / src / LString.h

diff --git a/src/LString.h b/src/LString.h
index ac5c6b878a92cc2b53868f9facb53a69e7a4938a..1e135594b319e992bc4e2ab19cd3ba86af47d77e 100644 (file)
--- a/src/LString.h
+++ b/src/LString.h
@@ -19,9 +19,12 @@
 #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
@@ -30,5 +33,7 @@ using std::string;
 #include "support/lyxstring.h"
 // using lyx::string;
 typedef lyxstring string;
+#define STRCONV(STR) STR.c_str()
 #endif
+
 #endif