diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2004-08-31 17:29:47 +0500 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2004-08-31 17:29:47 +0500 |
| commit | 7728843c66bcd2cc15f0b9b7bf6b50a3f1d01d22 (patch) | |
| tree | eed7c381d02891f80553ab5a57359a6796289cd6 /cmd-line-utils | |
| parent | 12e10b11d98e08b89ad689838fcea56ea54c0c7d (diff) | |
| download | mariadb-git-7728843c66bcd2cc15f0b9b7bf6b50a3f1d01d22.tar.gz | |
fixed compiling bug
(non gcc compilers don't understand '-Dx()=' option)
cmd-line-utils/libedit/Makefile.am:
discarded '-Dx()=' options for compatibility with non-gcc compilers
cmd-line-utils/libedit/config.h:
added empty definitions of __RCSID(x), __COPYRIGHT(x),
__RENAME(x), _DIAGASSERT(x)
cmd-line-utils/libedit/np/unvis.c:
added #include "config.h" to define __RCSID(x)
cmd-line-utils/libedit/np/vis.c:
reinsert #include "config.h" before using of __RCSID(x)
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/libedit/Makefile.am | 2 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/config.h | 5 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/np/unvis.c | 1 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/np/vis.c | 4 |
4 files changed, 9 insertions, 3 deletions
diff --git a/cmd-line-utils/libedit/Makefile.am b/cmd-line-utils/libedit/Makefile.am index c532884ca7d..b16ee36550d 100644 --- a/cmd-line-utils/libedit/Makefile.am +++ b/cmd-line-utils/libedit/Makefile.am @@ -30,7 +30,7 @@ EXTRA_DIST = makelist.sh np/unvis.c np/strlcpy.c np/vis.c np/strlcat.c np/fgetln CLEANFILES = makelist common.h emacs.h vi.h fcns.h help.h fcns.c help.c -DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR '-D__RCSID(x)=' '-D__COPYRIGHT(x)=' '-D__RENAME(x)=' '-D_DIAGASSERT(x)=' +DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR SUFFIXES = .sh diff --git a/cmd-line-utils/libedit/config.h b/cmd-line-utils/libedit/config.h index 966cd1bedc0..3a8d0fd4b55 100644 --- a/cmd-line-utils/libedit/config.h +++ b/cmd-line-utils/libedit/config.h @@ -1,3 +1,8 @@ #include "my_config.h" #include "sys.h" + +#define __RCSID(x) +#define __COPYRIGHT(x) +#define __RENAME(x) +#define _DIAGASSERT(x) diff --git a/cmd-line-utils/libedit/np/unvis.c b/cmd-line-utils/libedit/np/unvis.c index 01056c776e9..895ff2059ac 100644 --- a/cmd-line-utils/libedit/np/unvis.c +++ b/cmd-line-utils/libedit/np/unvis.c @@ -33,6 +33,7 @@ * SUCH DAMAGE. */ +#include "config.h" #if defined(LIBC_SCCS) && !defined(lint) #if 0 static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93"; diff --git a/cmd-line-utils/libedit/np/vis.c b/cmd-line-utils/libedit/np/vis.c index 9abc2e6e478..db42443800b 100644 --- a/cmd-line-utils/libedit/np/vis.c +++ b/cmd-line-utils/libedit/np/vis.c @@ -34,12 +34,12 @@ * SUCH DAMAGE. */ +#include "config.h" + #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: vis.c,v 1.22 2002/03/23 17:38:27 christos Exp $"); #endif /* LIBC_SCCS and not lint */ -#include "config.h" - #include <sys/types.h> #include <assert.h> #ifdef HAVE_ALLOCA_H |