diff options
author | rafan <rafan@FreeBSD.org> | 2007-12-30 11:08:14 +0000 |
---|---|---|
committer | rafan <rafan@FreeBSD.org> | 2007-12-30 11:08:14 +0000 |
commit | 9f9e55f97a716ef0dd4082c4cef00a5a95b624a9 (patch) | |
tree | 319eb1471eaf8c0c9cfc606e7cb8987ca9167507 /contrib/ncurses/menu | |
parent | 7ed1a8e865bedf5154163476c1224b868257ab1a (diff) | |
download | FreeBSD-src-9f9e55f97a716ef0dd4082c4cef00a5a95b624a9.zip FreeBSD-src-9f9e55f97a716ef0dd4082c4cef00a5a95b624a9.tar.gz |
Import ncurses 5.6-20071222 snapshot onto the vender branch
Diffstat (limited to 'contrib/ncurses/menu')
-rw-r--r-- | contrib/ncurses/menu/Makefile.in | 12 | ||||
-rw-r--r-- | contrib/ncurses/menu/headers | 3 | ||||
-rw-r--r-- | contrib/ncurses/menu/menu.h | 12 | ||||
-rw-r--r-- | contrib/ncurses/menu/modules | 8 |
4 files changed, 18 insertions, 17 deletions
diff --git a/contrib/ncurses/menu/Makefile.in b/contrib/ncurses/menu/Makefile.in index 8c3aa62..fc33dc7 100644 --- a/contrib/ncurses/menu/Makefile.in +++ b/contrib/ncurses/menu/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.43 2006/10/14 20:40:36 tom Exp $ +# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $ ############################################################################## -# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. # +# Copyright (c) 1998-2006,2007 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"), # @@ -27,7 +27,7 @@ # authorization. # ############################################################################## # -# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997 +# Author: Thomas E. Dickey 1996-on # # Makefile for menu source code. # @@ -91,7 +91,7 @@ CFLAGS_SHARED = $(CCFLAGS) @CC_SHARED_OPTS@ CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) -LINK = $(LIBTOOL_LINK) $(CC) +LINK = $(LIBTOOL_LINK) LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ SHLIB_DIRS = -L../lib @@ -106,8 +106,6 @@ ABI_VERSION = @cf_cv_abi_version@ RANLIB = @LIB_PREP@ -IMPORT_LIB = @IMPORT_LIB@ -SHARED_LIB = @SHARED_LIB@ LIBRARIES = @LIBS_TO_MAKE@ LINT = @LINT@ @@ -128,7 +126,7 @@ sources : $(AUTO_SRC) $(DESTDIR)$(bindir) \ $(DESTDIR)$(libdir) : - sh $(srcdir)/../mkinstalldirs $@ + sh $(srcdir)/../mkdirs.sh $@ # make copies to simplify include-paths while still keeping menu's include # file in this directory. diff --git a/contrib/ncurses/menu/headers b/contrib/ncurses/menu/headers index 3fe0be0..18c20af 100644 --- a/contrib/ncurses/menu/headers +++ b/contrib/ncurses/menu/headers @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 1998 Free Software Foundation, Inc. # +# Copyright (c) 1998,2006 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"), # @@ -30,3 +30,4 @@ # $(srcdir)/eti.h $(srcdir)/menu.h +# vile:makemode diff --git a/contrib/ncurses/menu/menu.h b/contrib/ncurses/menu/menu.h index f0b1f60..84352eb 100644 --- a/contrib/ncurses/menu/menu.h +++ b/contrib/ncurses/menu/menu.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. * + * Copyright (c) 1998-2003,2007 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 * @@ -30,7 +30,7 @@ * Author: Juergen Pfeifer, 1995,1997 * ****************************************************************************/ -/* $Id: menu.h,v 1.18 2003/11/08 20:48:24 tom Exp $ */ +/* $Id: menu.h,v 1.19 2007/02/24 17:32:13 tom Exp $ */ #ifndef ETI_MENU #define ETI_MENU @@ -217,23 +217,23 @@ extern NCURSES_EXPORT(int) pos_menu_cursor (const MENU *); extern NCURSES_EXPORT(int) post_menu (MENU *); extern NCURSES_EXPORT(int) scale_menu (const MENU *,int *,int *); extern NCURSES_EXPORT(int) set_current_item (MENU *menu,ITEM *item); -extern NCURSES_EXPORT(int) set_item_init (MENU *,void(*)(MENU *)); +extern NCURSES_EXPORT(int) set_item_init (MENU *, Menu_Hook); extern NCURSES_EXPORT(int) set_item_opts (ITEM *,Item_Options); -extern NCURSES_EXPORT(int) set_item_term (MENU *,void(*)(MENU *)); +extern NCURSES_EXPORT(int) set_item_term (MENU *, Menu_Hook); extern NCURSES_EXPORT(int) set_item_userptr (ITEM *, void *); extern NCURSES_EXPORT(int) set_item_value (ITEM *,bool); extern NCURSES_EXPORT(int) set_menu_back (MENU *,chtype); extern NCURSES_EXPORT(int) set_menu_fore (MENU *,chtype); extern NCURSES_EXPORT(int) set_menu_format (MENU *,int,int); extern NCURSES_EXPORT(int) set_menu_grey (MENU *,chtype); -extern NCURSES_EXPORT(int) set_menu_init (MENU *,void(*)(MENU *)); +extern NCURSES_EXPORT(int) set_menu_init (MENU *, Menu_Hook); extern NCURSES_EXPORT(int) set_menu_items (MENU *,ITEM **); extern NCURSES_EXPORT(int) set_menu_mark (MENU *, const char *); extern NCURSES_EXPORT(int) set_menu_opts (MENU *,Menu_Options); extern NCURSES_EXPORT(int) set_menu_pad (MENU *,int); extern NCURSES_EXPORT(int) set_menu_pattern (MENU *,const char *); extern NCURSES_EXPORT(int) set_menu_sub (MENU *,WINDOW *); -extern NCURSES_EXPORT(int) set_menu_term (MENU *,void(*)(MENU *)); +extern NCURSES_EXPORT(int) set_menu_term (MENU *, Menu_Hook); extern NCURSES_EXPORT(int) set_menu_userptr (MENU *,void *); extern NCURSES_EXPORT(int) set_menu_win (MENU *,WINDOW *); extern NCURSES_EXPORT(int) set_top_row (MENU *,int); diff --git a/contrib/ncurses/menu/modules b/contrib/ncurses/menu/modules index c78178a..abc4cf0 100644 --- a/contrib/ncurses/menu/modules +++ b/contrib/ncurses/menu/modules @@ -1,6 +1,6 @@ -# $Id: modules,v 1.16 2004/12/25 22:06:33 tom Exp $ +# $Id: modules,v 1.17 2006/12/24 00:52:39 tom Exp $ ############################################################################## -# Copyright (c) 1998,2004 Free Software Foundation, Inc. # +# Copyright (c) 1998-2004,2006 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"), # @@ -27,7 +27,7 @@ # authorization. # ############################################################################## # -# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997 +# Author: Thomas E. Dickey 1996-on # @ base @@ -59,3 +59,5 @@ m_sub lib $(srcdir) $(MENU_PRIV_H) m_trace lib $(srcdir) $(MENU_PRIV_H) m_userptr lib $(srcdir) $(MENU_PRIV_H) m_win lib $(srcdir) $(MENU_PRIV_H) + +# vile:makemode |