X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLString.h;h=1e135594b319e992bc4e2ab19cd3ba86af47d77e;hb=b99a5acc7f18c3f885856fa962c0f0a63a0ca5ad;hp=3a684322a10d24dadfdd399265e85646732a232a;hpb=6bba977f42b0cde753ac2ffd26f3f9c6b32ba0b6;p=lyx.git diff --git a/src/LString.h b/src/LString.h index 3a684322a1..1e135594b3 100644 --- a/src/LString.h +++ b/src/LString.h @@ -1,21 +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 header should always be included before LString.h +#endif +#endif #ifndef USE_INCLUDED_STRING + #include using std::string; +#define STRCONV(STR) STR #else + #ifdef __STRING__ #error The header has been included before LString.h #else @@ -24,5 +33,7 @@ using std::string; #include "support/lyxstring.h" // using lyx::string; typedef lyxstring string; +#define STRCONV(STR) STR.c_str() #endif + #endif