diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2017-11-02 15:04:56 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2017-11-02 15:04:56 +0100 |
| commit | d8523b0db8adf0559040834487e5371c525132cb (patch) | |
| tree | e6a8eab249d3de3487aca01df7eae14534a503aa /vdr.c | |
| parent | d74dd7a60a3ea3ca563fd307885d6d4b571d9a2f (diff) | |
| download | vdr-d8523b0db8adf0559040834487e5371c525132cb.tar.gz vdr-d8523b0db8adf0559040834487e5371c525132cb.tar.bz2 | |
The macros used to control deprecated code or functions have been changed to hold numeric values; the default for DEPRECATED_VDR_CHARSET_OVERRIDE has been set to 0
Diffstat (limited to 'vdr.c')
| -rw-r--r-- | vdr.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -22,7 +22,7 @@ * * The project's page is at http://www.tvdr.de * - * $Id: vdr.c 4.19 2017/10/31 09:46:22 kls Exp $ + * $Id: vdr.c 4.20 2017/11/02 14:59:50 kls Exp $ */ #include <getopt.h> @@ -221,8 +221,10 @@ int main(int argc, char *argv[]) int WatchdogTimeout = DEFAULTWATCHDOG; const char *Terminal = NULL; const char *OverrideCharacterTable = NULL; -#define DEPRECATED_VDR_CHARSET_OVERRIDE -#ifdef DEPRECATED_VDR_CHARSET_OVERRIDE +#ifndef DEPRECATED_VDR_CHARSET_OVERRIDE +#define DEPRECATED_VDR_CHARSET_OVERRIDE 0 +#endif +#if DEPRECATED_VDR_CHARSET_OVERRIDE OverrideCharacterTable = getenv("VDR_CHARSET_OVERRIDE"); const char *DeprecatedVdrCharsetOverride = OverrideCharacterTable; #endif @@ -703,7 +705,7 @@ int main(int argc, char *argv[]) isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown"); cCharSetConv::SetSystemCharacterTable(CodeSet); } -#ifdef DEPRECATED_VDR_CHARSET_OVERRIDE +#if DEPRECATED_VDR_CHARSET_OVERRIDE if (DeprecatedVdrCharsetOverride) isyslog("use of environment variable VDR_CHARSET_OVERRIDE (%s) is deprecated!", DeprecatedVdrCharsetOverride); #endif |