Merge branch 'master' into win32-x64-working

This commit is contained in:
nhmall
2015-05-04 17:56:35 -04:00
5 changed files with 23 additions and 5 deletions

View File

@@ -173,8 +173,10 @@
# define WIZARD_NAME "wizard"
#endif
/* #define SYSCF */ /* use a global configuration */
/* #define SYSCF_FILE "sysconf" */ /* global configuration is in a file */
#ifndef SYSCF
#define SYSCF /* use a global configuration */
#define SYSCF_FILE "sysconf" /* global configuration is in a file */
#endif
#ifndef GDBPATH
# define GDBPATH "/usr/bin/gdb"