summaryrefslogtreecommitdiff
path: root/hscript/script.cc
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-10-23 00:37:06 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-10-23 00:37:06 -0500
commit4c2eb0b5744d5301e3910b549debd7ddf6027cdc (patch)
tree531024227bd3abc25ca9b3bc5cdb5bb1d6938660 /hscript/script.cc
parenta05f77c6755047c96c721a09c10a536a9342d7e9 (diff)
downloadhorizon-4c2eb0b5744d5301e3910b549debd7ddf6027cdc.tar.gz
horizon-4c2eb0b5744d5301e3910b549debd7ddf6027cdc.tar.bz2
horizon-4c2eb0b5744d5301e3910b549debd7ddf6027cdc.tar.xz
horizon-4c2eb0b5744d5301e3910b549debd7ddf6027cdc.zip
hscript: Use SCRIPT_LINE_MAX instead of shadowing <climits> LINE_MAX
Diffstat (limited to 'hscript/script.cc')
-rw-r--r--hscript/script.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/hscript/script.cc b/hscript/script.cc
index ee638bb..0e99059 100644
--- a/hscript/script.cc
+++ b/hscript/script.cc
@@ -26,7 +26,7 @@
#include "util/output.hh"
-#define LINE_MAX 512
+#define SCRIPT_LINE_MAX 512
typedef Horizon::Keys::Key *(*key_parse_fn)(const std::string &, int, int*, int*);
@@ -388,7 +388,7 @@ const Script *Script::load(std::istream &sstream,
Script *the_script = new Script;
int lineno = 0;
- char nextline[LINE_MAX];
+ char nextline[SCRIPT_LINE_MAX];
const std::string delim(" \t");
int errors = 0, warnings = 0;
@@ -447,7 +447,8 @@ const Script *Script::load(std::istream &sstream,
if(sstream.fail() && !sstream.eof()) {
output_error("installfile:" + std::to_string(lineno + 1),
"line exceeds maximum length",
- "Maximum line length is " + std::to_string(LINE_MAX));
+ "Maximum line length is " +
+ std::to_string(SCRIPT_LINE_MAX));
errors++;
}