Change the way external symbols are defined to avoid COMMON symbols, which

don't work on OSX very well.
This commit is contained in:
David Given 2019-02-10 12:57:22 +01:00
parent 666d9a3edb
commit 8a7077d5a9
2 changed files with 8 additions and 13 deletions

View file

@ -6,15 +6,11 @@
#include "list.h" #include "list.h"
#include "trans.h" #include "trans.h"
#ifndef NORCSID /* Include once without redefining EXTERN, to declare all the symbols as extern. */
static char rcs_id[] = "$Id$" ;
#endif
#undef EXTERN
#define EXTERN
#include "data.h" #include "data.h"
#ifndef NORCSID /* And again without EXTERN, to define them here. Without the extern versions above
static char rcs_data[] = RCS_DATA ; * then these symbols will all end up as COMMON, which is poorly supported on OSX. */
#endif #undef EXTERN
#define EXTERN
#include "data.h"

View file

@ -2,9 +2,8 @@
* (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands. * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
* See the copyright notice in the ACK home directory, in the file "Copyright". * See the copyright notice in the ACK home directory, in the file "Copyright".
*/ */
#ifndef NORCSID
#define RCS_DATA "$Id$" /* WARNING: don't put guards around this file (there are reasons). See data.c. */
#endif
EXTERN char *stopsuffix; /* Suffix to stop at */ EXTERN char *stopsuffix; /* Suffix to stop at */
EXTERN char *machine; /* The machine id */ EXTERN char *machine; /* The machine id */