michael@682: Index: include/curses.h.in
michael@682: --- include/curses.h.in.orig	2012-05-29 10:39:26.000000000 +0200
michael@682: +++ include/curses.h.in	2012-05-29 10:39:27.000000000 +0200
michael@682: @@ -63,7 +63,11 @@
michael@682:   * User-definable tweak to disable the include of <stdbool.h>.
michael@682:   */
michael@682:  #ifndef NCURSES_ENABLE_STDBOOL_H
michael@682: -#define NCURSES_ENABLE_STDBOOL_H @cf_cv_header_stdbool_h@
michael@682: +#if defined(__STDC__) && (__STDC_VERSION__ >= 199901L) && !defined(__osf__)
michael@682: +#define NCURSES_ENABLE_STDBOOL_H 1
michael@682: +#else
michael@682: +#define NCURSES_ENABLE_STDBOOL_H 0
michael@682: +#endif
michael@682:  #endif
michael@682:  
michael@682:  /*
michael@682: Index: ncurses/Makefile.in
michael@682: --- ncurses/Makefile.in.orig	2012-05-29 10:39:27.000000000 +0200
michael@682: +++ ncurses/Makefile.in	2012-05-29 10:40:19.000000000 +0200
michael@682: @@ -176,7 +176,7 @@
michael@682:  	$(INCDIR)/nc_mingw.h
michael@682:  
michael@682:  TEST_DEPS	= ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
michael@682: -TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
michael@682: +TEST_ARGS	= @TEST_ARGS@ @LDFLAGS_SHARED@ 
michael@682:  TEST_LDFLAGS	= @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@
michael@682:  
michael@682:  TEST_PROGS = \
michael@682: @@ -292,7 +292,8 @@
michael@682:  	@ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS)
michael@682:  
michael@682:  lib_mvcur$x : $(serial)/lib_mvcur.c $(TEST_DEPS) \
michael@682: -		../@DFT_OBJ_SUBDIR@/dump_entry$o
michael@682: +		../@DFT_OBJ_SUBDIR@/dump_entry$o \
michael@682: +		../@DFT_OBJ_SUBDIR@/comp_parse$o
michael@682:  	@ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS)
michael@682:  
michael@682:  link_test$x : ./link_test.c $(TEST_DEPS) \
michael@682: Index: ncurses/tinfo/comp_error.c
michael@682: --- ncurses/tinfo/comp_error.c.orig	2012-05-29 10:39:26.000000000 +0200
michael@682: +++ ncurses/tinfo/comp_error.c	2012-05-29 10:39:27.000000000 +0200
michael@682: @@ -43,7 +43,7 @@
michael@682:  
michael@682:  MODULE_ID("$Id: comp_error.c,v 1.36 2012/02/22 22:34:31 tom Exp $")
michael@682:  
michael@682: -NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
michael@682: +NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = TRUE;
michael@682:  NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
michael@682:  NCURSES_EXPORT_VAR(int) _nc_curr_col = 0; /* current column # in input */
michael@682:  
michael@682: Index: ncurses/tinfo/comp_parse.c
michael@682: --- ncurses/tinfo/comp_parse.c.orig	2012-05-29 10:39:27.000000000 +0200
michael@682: +++ ncurses/tinfo/comp_parse.c	2012-05-29 10:39:27.000000000 +0200
michael@682: @@ -281,6 +281,7 @@
michael@682:  
michael@682:      DEBUG(2, ("RESOLUTION BEGINNING"));
michael@682:  
michael@682: +#if 0
michael@682:      /*
michael@682:       * Check for multiple occurrences of the same name.
michael@682:       */
michael@682: @@ -308,6 +309,7 @@
michael@682:  	return (FALSE);
michael@682:  
michael@682:      DEBUG(2, ("NO MULTIPLE NAME OCCURRENCES"));
michael@682: +#endif
michael@682:  
michael@682:      /*
michael@682:       * First resolution stage: compute link pointers corresponding to names.
michael@682: Index: progs/Makefile.in
michael@682: --- progs/Makefile.in.orig	2012-05-29 10:39:27.000000000 +0200
michael@682: +++ progs/Makefile.in	2012-05-29 10:39:27.000000000 +0200
michael@682: @@ -114,10 +114,10 @@
michael@682:  
michael@682:  LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
michael@682:  
michael@682: -LIBS_TIC	= @TINFO_LDFLAGS@ @LDFLAGS_STATIC@ @TICS_LIBS@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
michael@682: +LIBS_TIC	= @TINFO_LDFLAGS@ @TICS_LIBS@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
michael@682:  LDFLAGS_TIC	= @TICS_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
michael@682:  
michael@682: -LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
michael@682: +LIBS_TINFO	= @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
michael@682:  LDFLAGS_TINFO	= @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
michael@682:  
michael@682:  LINT		= @LINT@
michael@682: @@ -228,6 +228,7 @@
michael@682:  DEPS_TIC = \
michael@682:  	$(MODEL)/tic$o \
michael@682:  	$(MODEL)/dump_entry$o \
michael@682: +	$(MODEL)/comp_parse$o \
michael@682:  	$(MODEL)/transform$o
michael@682:  
michael@682:  tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
michael@682: @@ -253,6 +254,7 @@
michael@682:  
michael@682:  DEPS_TPUT = \
michael@682:  	$(MODEL)/tput$o \
michael@682: +	$(MODEL)/lib_tparm$o \
michael@682:  	$(MODEL)/transform$o
michael@682:  
michael@682:  tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
michael@682: @@ -260,7 +262,8 @@
michael@682:  
michael@682:  DEPS_INFOCMP = \
michael@682:  	$(MODEL)/infocmp$o \
michael@682: -	$(MODEL)/dump_entry$o
michael@682: +	$(MODEL)/dump_entry$o \
michael@682: +	$(MODEL)/comp_parse$o
michael@682:  
michael@682:  infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
michael@682:  	@ECHO_LD@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_TIC) -o $@
michael@682: Index: test/Makefile.in
michael@682: --- test/Makefile.in.orig	2012-05-29 10:39:26.000000000 +0200
michael@682: +++ test/Makefile.in	2012-05-29 10:39:27.000000000 +0200
michael@682: @@ -102,7 +102,7 @@
michael@682:  LDFLAGS_PROFILE	= $(LDFLAGS) $(CFLAGS_PROFILE)
michael@682:  LDFLAGS_SHARED	= $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
michael@682:  
michael@682: -TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
michael@682: +TEST_ARGS	= @TEST_ARGS@
michael@682:  
michael@682:  # use these for linking with all of the libraries
michael@682:  LIBS_DEFAULT	= $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB)
michael@682: @@ -117,7 +117,7 @@
michael@682:  LDFLAGS_CURSES	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)
michael@682:  
michael@682:  # use these for linking with the tinfo library if we have it, or curses library if not
michael@682: -LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
michael@682: +LIBS_TINFO	= @TINFO_LIBS@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
michael@682:  LDFLAGS_TINFO	= @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
michael@682:  
michael@682:  LINT		= @LINT@
michael@682: Index: test/programs
michael@682: --- test/programs.orig	2009-09-12 21:44:01.000000000 +0200
michael@682: +++ test/programs	2012-05-29 10:39:27.000000000 +0200
michael@682: @@ -38,7 +38,7 @@
michael@682:  clip_printw	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	clip_printw
michael@682:  color_set	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	color_set
michael@682:  demo_altkeys	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_altkeys
michael@682: -demo_defkey	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_defkey
michael@682: +demo_defkey	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_defkey key_defined
michael@682:  demo_forms	$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	demo_forms edit_field
michael@682:  demo_keyok	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_keyok
michael@682:  demo_menus	$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	demo_menus