X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLString.h;h=cc9df47947332242c7603f6af14be18f4fb9598e;hb=55bb299483e54a48d029703c27e1881aa90b4548;hp=0f2eccc8cdeaeb8538f7058a89ae37ef2b9b8c89;hpb=0088121bd8c3fc7f2109e8dc9b22b73ca193f20e;p=lyx.git

diff --git a/src/LString.h b/src/LString.h
index 0f2eccc8cd..cc9df47947 100644
--- a/src/LString.h
+++ b/src/LString.h
@@ -5,18 +5,28 @@
  *           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 
 
+#ifndef _CONFIG_H
+#error The <config.h> header should always be included before LString.h
+#endif
+
 #ifndef USE_INCLUDED_STRING
 #include <string>
 using std::string;
 #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;
 #endif
 #endif