John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / LString.h

diff --git a/src/LString.h b/src/LString.h
index eabdc7e815caa6a3035866c296ce8ce2852803af..cc9df47947332242c7603f6af14be18f4fb9598e 100644 (file)
--- a/src/LString.h
+++ b/src/LString.h
@@ -4,19 +4,29 @@
  * 
  *           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 
 
+#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