X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLString.h;h=1e135594b319e992bc4e2ab19cd3ba86af47d77e;hb=b99a5acc7f18c3f885856fa962c0f0a63a0ca5ad;hp=459bdb76f8360f9d5a61e24fac18d482ba7e02c8;hpb=35584afc1162dec2cf9fff79305e95cb3b75aefb;p=lyx.git

diff --git a/src/LString.h b/src/LString.h
index 459bdb76f8..1e135594b3 100644
--- a/src/LString.h
+++ b/src/LString.h
@@ -1,24 +1,39 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
- *	    Copyright (C) 1995 Matthias Ettrich
- *          Copyright (C) 1995-1999 The LyX Team.
  *
- *======================================================*/
+ *	    Copyright 1995 Matthias Ettrich
+ *          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::wstring;
+#define STRCONV(STR) STR
+#else
+
+#ifdef __STRING__
+#error The <string> header has been included before LString.h
 #else
+#define __STRING__
+#endif
 #include "support/lyxstring.h"
+// using lyx::string;
 typedef lyxstring string;
-//typedef lyxwstring wstring;
+#define STRCONV(STR) STR.c_str()
 #endif
+
 #endif