Merge pull request #29 from wsbu/feature/fix-err_h-header

Fix `err.h` inclusion to only be used on Linux
argtable · Mar 15, 2019 · 2aed411 · 2aed411
2 parents aed5c65 + bd9b319
commit 2aed411
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -36,7 +36,7 @@ class ArgTable3(ConanFile):
     name = 'argtable3'
     description = 'A single-file, ANSI C, command-line parsing library that parses GNU-style command-line options.'
     url = 'https://github.com/argtable/argtable3'
-    version = tools.load('version.txt').strip() + '-2'
+    version = tools.load('version.txt').strip() + '-3'
     license = 'BSD 3-Clause'
     settings = 'os', 'compiler', 'build_type', 'arch'
     options = {

diff --git a/src/argtable3.c b/src/argtable3.c
@@ -377,7 +377,7 @@ static const char illoptstring[] = "unknown option -- %s";
 
 
 
-#ifdef _WIN32
+#if !defined(__linux__)
 /* Windows needs warnx().  We change the definition though:
  *  1. (another) global is defined, opterrmsg, which holds the error message
  *  2. errors are always printed out on stderr w/o the program name