ncurses 5.7 - patch 20090704

[ncurses.git] / ncurses / tty / MKexpanded.sh

diff --git a/ncurses/tty/MKexpanded.sh b/ncurses/tty/MKexpanded.sh
index b008becc4f07c4e2d8d54350e618579228b04985..c7741ae7ce210335b18f275674c7873a9a7cb16b 100755 (executable)
--- a/ncurses/tty/MKexpanded.sh
+++ b/ncurses/tty/MKexpanded.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 ##############################################################################
 #! /bin/sh
 ##############################################################################

-# Copyright (c) 1998 Free Software Foundation, Inc.                          #
+# Copyright (c) 1998-2008,2009 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"), #
 #                                                                            #
 # 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.                                                             #
 ##############################################################################
 #
 # authorization.                                                             #
 ##############################################################################
 #

-# Author: Thomas E. Dickey <dickey@clark.net> 1997
+# Author: Thomas E. Dickey, 1997-on

 #
 #

-# $Id: MKexpanded.sh,v 1.7 1998/11/11 20:15:39 Alexander.V.Lukyanov Exp $
+# $Id: MKexpanded.sh,v 1.16 2009/07/04 16:45:03 tom Exp $

 #
 # Script to generate 'expanded.c', a dummy source that contains functions
 # corresponding to complex macros used in this library.  By making functions,
 #
 # Script to generate 'expanded.c', a dummy source that contains functions
 # corresponding to complex macros used in this library.  By making functions,


@@ -52,9 +52,15 @@ trap "rm -f $TMP" 0 1 2 5 15
 
 cat <<EOF
 /* generated by MKexpanded.sh */
 
 cat <<EOF
 /* generated by MKexpanded.sh */

+#define NEED_NCURSES_CH_T 1

 #include <curses.priv.h>
 #include <term.h>
 #include <curses.priv.h>
 #include <term.h>

-#ifdef NCURSES_EXPANDED
+
+#ifndef CUR
+#define CUR SP_TERMTYPE
+#endif
+
+#if NCURSES_EXPANDED

 EOF
 
 cat >$TMP <<EOF
 EOF
 
 cat >$TMP <<EOF


@@ -68,36 +74,62 @@ cat >$TMP <<EOF
 #undef FALSE
 /* this is a marker */
 IGNORE
 #undef FALSE
 /* this is a marker */
 IGNORE

-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);
 }
 {
        toggle_attr_on(*S,at);
 }

-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);
 }
 {
        toggle_attr_off(*S,at);
 }

-int _nc_can_clear_with(chtype ch)
+
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(_nc_DelCharCost) (NCURSES_SP_DCLx int count)

 {
 {

-       return can_clear_with(ch);
+       return DelCharCost(SP_PARM, count);

 }
 }

-int _nc_DelCharCost(int count)
+
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(_nc_InsCharCost) (NCURSES_SP_DCLx int count)

 {
 {

-       return DelCharCost(count);
+       return InsCharCost(SP_PARM, count);

 }
 }

-int _nc_InsCharCost(int count)
+
+NCURSES_EXPORT(void)
+NCURSES_SP_NAME(_nc_UpdateAttrs) (NCURSES_SP_DCLx CARG_CH_T c)

 {
 {

-       return InsCharCost(count);
+       UpdateAttrs(SP_PARM, CHDEREF(c));

 }
 }

-void _nc_UpdateAttrs(chtype c)
+
+@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)

 {
 {

-       UpdateAttrs(c);
+       NCURSES_SP_NAME(_nc_UpdateAttrs)(CURRENT_SCREEN,c);

 }
 }

+@endif

 EOF
 
 EOF
 

-$preprocessor $TMP 2>/dev/null | sed -e '1,/^IGNORE$/d'
+$preprocessor $TMP 2>/dev/null | \
+       sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#if_/#if /'

 
 cat <<EOF
 #else /* ! NCURSES_EXPANDED */
 
 cat <<EOF
 #else /* ! NCURSES_EXPANDED */

-void _nc_expanded(void) { }
+NCURSES_EXPORT(void) _nc_expanded (void) { }

 #endif /* NCURSES_EXPANDED */
 EOF
 #endif /* NCURSES_EXPANDED */
 EOF