a pointer is not an array.

This commit is contained in:
espie 2010-05-24 10:10:39 +00:00
parent 41a285bf45
commit 3aeb85a3f7
3 changed files with 31 additions and 5 deletions

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_history_c,v 1.1 2010/05/24 10:10:39 espie Exp $
--- src/history.c.orig Mon May 24 12:07:15 2010
+++ src/history.c Mon May 24 12:08:26 2010
@@ -66,7 +66,9 @@ static Aline blankline[1] = { BLANK_ALINE };
static struct History input[1];
static int wnmatch = 4, wnlines = 5, wdmatch = 2, wdlines = 5;
-struct History globalhist[1], localhist[1];
+static struct History globalhist_storage, localhist_storage;
+struct History *globalhist = &globalhist_storage,
+ *localhist = &localhist_storage;
int log_count = 0;
int norecord = 0; /* supress history (but not log) recording */
int nolog = 0; /* supress log (but not history) recording */

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_history_h,v 1.1 2010/05/24 10:10:39 espie Exp $
--- src/history.h.orig Mon May 24 12:07:03 2010
+++ src/history.h Mon May 24 12:07:13 2010
@@ -31,7 +31,7 @@ extern void NDECL(free_histories);
#define record_global(aline) recordline(globalhist, (aline))
#define record_local(aline) recordline(localhist, (aline))
-extern struct History globalhist[], localhist[];
+extern struct History *globalhist, *localhist;
extern int log_count, norecord, nolog;
# else /* NO_HISTORY */

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-unix_unix.mak,v 1.1 2000/09/20 22:42:12 avsm Exp $
--- unix/unix.mak.orig Wed Sep 20 18:04:05 2000
+++ unix/unix.mak Wed Sep 20 18:04:53 2000
@@ -22,7 +22,6 @@
$OpenBSD: patch-unix_unix.mak,v 1.2 2010/05/24 10:10:39 espie Exp $
--- unix/unix.mak.orig Sat Mar 6 23:43:28 1999
+++ unix/unix.mak Sat May 22 16:24:59 2010
@@ -22,7 +22,6 @@ BUILDERS = Makefile
install: _failmsg _all $(TF) LIBRARY $(MANPAGE) $(SYMLINK)
@echo '#####################################################' > exitmsg
@echo '## TinyFugue installation successful.' >> exitmsg
@ -9,7 +9,7 @@ $OpenBSD: patch-unix_unix.mak,v 1.1 2000/09/20 22:42:12 avsm Exp $
@DIR=`echo $(TF) | sed 's;/[^/]*$$;;'`; \
echo ":$(PATH):" | egrep ":$${DIR}:" >/dev/null 2>&1 || { \
echo ; \
@@ -35,7 +34,6 @@
@@ -35,7 +34,6 @@ install: _failmsg _all $(TF) LIBRARY $(MANPAGE) $(SYM
all files: _all
@echo '#####################################################' > exitmsg
@echo '## TinyFugue build successful.' >> exitmsg