X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLString.h;h=1e135594b319e992bc4e2ab19cd3ba86af47d77e;hb=2523638092e2024bac408eee98ad2094bc4e4089;hp=7a4779d727ca846a412a94d8ae15a873993577a9;hpb=ce07524d36bfa917122c9674a6992058f7676128;p=lyx.git

diff --git a/src/LString.h b/src/LString.h
index 7a4779d727..1e135594b3 100644
--- a/src/LString.h
+++ b/src/LString.h
@@ -1,22 +1,30 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #ifndef LSTRING_H
-#define 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;
-using std::getline
+#define STRCONV(STR) STR
 #else
+
 #ifdef __STRING__
 #error The <string> header has been included before LString.h
 #else
@@ -25,5 +33,7 @@ using std::getline
 #include "support/lyxstring.h"
 // using lyx::string;
 typedef lyxstring string;
+#define STRCONV(STR) STR.c_str()
 #endif
+
 #endif