aboutsummaryrefslogtreecommitdiff
path: root/ncurses/tty/MKexpanded.sh
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
committerXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
commit4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a (patch)
treeb8f6e12b479a78216f3bffb8e1258d54087268de /ncurses/tty/MKexpanded.sh
parente07762606a5bf651a501cb095c98cba90e4a8fe2 (diff)
downloadsrc-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.tar.gz
src-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.zip
Undo two previous imports which was never done in preparation of doing a
new import.
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=262616
Diffstat (limited to 'ncurses/tty/MKexpanded.sh')
-rwxr-xr-xncurses/tty/MKexpanded.sh61
1 files changed, 13 insertions, 48 deletions
diff --git a/ncurses/tty/MKexpanded.sh b/ncurses/tty/MKexpanded.sh
index 7a5f5993c487..bf9acf21aa43 100755
--- a/ncurses/tty/MKexpanded.sh
+++ b/ncurses/tty/MKexpanded.sh
@@ -1,6 +1,6 @@
#! /bin/sh
##############################################################################
-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2000,2005 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,9 +27,9 @@
# authorization. #
##############################################################################
#
-# Author: Thomas E. Dickey, 1997-on
+# Author: Thomas E. Dickey <dickey@clark.net> 1997
#
-# $Id: MKexpanded.sh,v 1.17 2010/01/23 17:57:43 tom Exp $
+# $Id: MKexpanded.sh,v 1.11 2005/01/02 01:06:40 tom Exp $
#
# Script to generate 'expanded.c', a dummy source that contains functions
# corresponding to complex macros used in this library. By making functions,
@@ -52,13 +52,8 @@ trap "rm -f $TMP" 0 1 2 5 15
cat <<EOF
/* generated by MKexpanded.sh */
-#define NEED_NCURSES_CH_T 1
#include <curses.priv.h>
-
-#ifndef CUR
-#define CUR SP_TERMTYPE
-#endif
-
+#include <term.h>
#if NCURSES_EXPANDED
EOF
@@ -73,59 +68,29 @@ cat >$TMP <<EOF
#undef FALSE
/* this is a marker */
IGNORE
-NCURSES_EXPORT(void)
-_nc_toggle_attr_on (attr_t *S, attr_t at)
+NCURSES_EXPORT(void) _nc_toggle_attr_on (attr_t *S, attr_t at)
{
toggle_attr_on(*S,at);
}
-
-NCURSES_EXPORT(void)
-_nc_toggle_attr_off (attr_t *S, attr_t at)
+NCURSES_EXPORT(void) _nc_toggle_attr_off (attr_t *S, attr_t at)
{
toggle_attr_off(*S,at);
}
-
-NCURSES_EXPORT(int)
-NCURSES_SP_NAME(_nc_DelCharCost) (NCURSES_SP_DCLx int count)
-{
- return DelCharCost(SP_PARM, count);
-}
-
-NCURSES_EXPORT(int)
-NCURSES_SP_NAME(_nc_InsCharCost) (NCURSES_SP_DCLx int count)
+NCURSES_EXPORT(int) _nc_DelCharCost (int count)
{
- return InsCharCost(SP_PARM, count);
+ return DelCharCost(count);
}
-
-NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_UpdateAttrs) (NCURSES_SP_DCLx CARG_CH_T c)
+NCURSES_EXPORT(int) _nc_InsCharCost (int count)
{
- UpdateAttrs(SP_PARM, CHDEREF(c));
+ return InsCharCost(count);
}
-
-@if_NCURSES_SP_FUNCS
-NCURSES_EXPORT(int)
-_nc_DelCharCost (int count)
-{
- return NCURSES_SP_NAME(_nc_DelCharCost) (CURRENT_SCREEN, count);
-}
-
-NCURSES_EXPORT(int)
-_nc_InsCharCost (int count)
-{
- return NCURSES_SP_NAME(_nc_InsCharCost)(CURRENT_SCREEN, count);
-}
-
-NCURSES_EXPORT(void)
-_nc_UpdateAttrs (CARG_CH_T c)
+NCURSES_EXPORT(void) _nc_UpdateAttrs (NCURSES_CH_T c)
{
- NCURSES_SP_NAME(_nc_UpdateAttrs)(CURRENT_SCREEN,c);
+ UpdateAttrs(c);
}
-@endif
EOF
-$preprocessor $TMP 2>/dev/null | \
- sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#if_/#if /'
+$preprocessor $TMP 2>/dev/null | sed -e '1,/^IGNORE$/d'
cat <<EOF
#else /* ! NCURSES_EXPANDED */