diff options
| author | peter <peter@FreeBSD.org> | 2000-07-03 09:24:12 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2000-07-03 09:24:12 +0000 |
| commit | cc6a5cc05f3c2cde24338d35c9714f1e7ebf032e (patch) | |
| tree | 27e79485df3c9195e6fe58960df47f675f41f1e9 /contrib/ncurses/form | |
| parent | b22d00e9129b5cb2fee8da1592ca70eff2222f7e (diff) | |
| download | FreeBSD-src-cc6a5cc05f3c2cde24338d35c9714f1e7ebf032e.zip FreeBSD-src-cc6a5cc05f3c2cde24338d35c9714f1e7ebf032e.tar.gz | |
Import the most recent ncurses 5.1 prerelease (20000701).
Mostly this is intended to resolve the trace() badness once and for all.
Obtained from: ftp://dickey.his.com/ncurses/
Diffstat (limited to 'contrib/ncurses/form')
| -rw-r--r-- | contrib/ncurses/form/Makefile.in | 8 | ||||
| -rw-r--r-- | contrib/ncurses/form/fty_enum.c | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/contrib/ncurses/form/Makefile.in b/contrib/ncurses/form/Makefile.in index 7980530..dd65638 100644 --- a/contrib/ncurses/form/Makefile.in +++ b/contrib/ncurses/form/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.25 1998/04/04 00:49:55 tom Exp $ +# $Id: Makefile.in,v 1.28 2000/05/28 01:40:18 tom Exp $ ############################################################################## -# Copyright (c) 1998 Free Software Foundation, Inc. # +# Copyright (c) 1998-2000 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -64,6 +64,7 @@ LD = @LD@ LN_S = @LN_S@ CC = @CC@ +CPP = @CPP@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ \ @@ -82,7 +83,7 @@ LINK = $(CC) LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ SHLIB_DIRS = -L../lib -L$(libdir) -SHLIB_LIST = $(SHLIB_DIRS) -lncurses @SHLIB_LIST@ +SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ MK_SHARED_LIB = @MK_SHARED_LIB@ @@ -102,6 +103,7 @@ AUTO_SRC = \ ################################################################################ all \ +libs \ install :: $(AUTO_SRC) $(LIBRARIES) sources : $(AUTO_SRC) diff --git a/contrib/ncurses/form/fty_enum.c b/contrib/ncurses/form/fty_enum.c index 9716159..701d80f 100644 --- a/contrib/ncurses/form/fty_enum.c +++ b/contrib/ncurses/form/fty_enum.c @@ -13,7 +13,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fty_enum.c,v 1.10 1999/05/16 17:23:14 juergen Exp $") +MODULE_ID("$Id: fty_enum.c,v 1.11 2000/03/19 01:09:56 Bruno.Haible Exp $") typedef struct { char **kwds; @@ -225,7 +225,7 @@ static bool Next_Enum(FIELD * field, const void * argp) } if (cnt<=0) kwds = args->kwds; - if ((cnt>=0) || (Compare((unsigned char *)dummy,bp,ccase)==EXACT)) + if ((cnt>=0) || (Compare((const unsigned char *)dummy,bp,ccase)==EXACT)) { set_field_buffer(field,0,*kwds); return TRUE; @@ -261,7 +261,7 @@ static bool Previous_Enum(FIELD * field, const void * argp) if (cnt<=0) kwds = &args->kwds[args->count-1]; - if ((cnt>=0) || (Compare((unsigned char *)dummy,bp,ccase)==EXACT)) + if ((cnt>=0) || (Compare((const unsigned char *)dummy,bp,ccase)==EXACT)) { set_field_buffer(field,0,*kwds); return TRUE; |
