X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;ds=sidebyside;f=ncurses%2Ftty%2FMKexpanded.sh;h=845e77592583f9a07b42e2f2f8f3abb2e8a68000;hb=3ce2c58251fe1353768cc630103cdb12ecc8be0a;hp=e44f58343a5dc42d11b4ab66ee3fac4944460146;hpb=c633e5103a29a38532cf1925257b91cea33fd090;p=ncurses.git

diff --git a/ncurses/tty/MKexpanded.sh b/ncurses/tty/MKexpanded.sh
index e44f5834..845e7759 100755
--- a/ncurses/tty/MKexpanded.sh
+++ b/ncurses/tty/MKexpanded.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 ##############################################################################
-# Copyright (c) 1998,2000 Free Software Foundation, Inc.                     #
+# Copyright (c) 1998-2005,2008 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"), #
@@ -29,7 +29,7 @@
 #
 # Author: Thomas E. Dickey <dickey@clark.net> 1997
 #
-# $Id: MKexpanded.sh,v 1.9 2000/09/02 22:55:21 tom Exp $
+# $Id: MKexpanded.sh,v 1.12 2008/11/16 00:19:59 juergen Exp $
 #
 # Script to generate 'expanded.c', a dummy source that contains functions
 # corresponding to complex macros used in this library.  By making functions,
@@ -52,6 +52,7 @@ 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>
 #include <term.h>
 #if NCURSES_EXPANDED
@@ -68,25 +69,37 @@ cat >$TMP <<EOF
 #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);
 }
-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);
 }
-int _nc_DelCharCost(int count)
+NCURSES_EXPORT(int) _nc_safe_DelCharCost (SCREEN* sp, int count)
 {
-	return DelCharCost(count);
+	return DelCharCost(sp,count);
 }
-int _nc_InsCharCost(int count)
+NCURSES_EXPORT(int) _nc_DelCharCost (int count)
 {
-	return InsCharCost(count);
+	return _nc_safe_DelCharCost (CURRENT_SCREEN, count);
 }
-void _nc_UpdateAttrs(chtype c)
+NCURSES_EXPORT(int) _nc_safe_InsCharCost (SCREEN* sp, int count)
 {
-	UpdateAttrs(c);
+	return InsCharCost(sp, count);
+}
+NCURSES_EXPORT(int) _nc_InsCharCost (int count)
+{
+	return _nc_safe_InsCharCost(CURRENT_SCREEN, count);
+}
+NCURSES_EXPORT(void) _nc_safe_UpdateAttrs (SCREEN* sp, NCURSES_CH_T c)
+{
+	UpdateAttrs(sp,c);
+}
+NCURSES_EXPORT(void) _nc_UpdateAttrs (NCURSES_CH_T c)
+{
+	_nc_safe_UpdateAttrs(CURRENT_SCREEN,c);
 }
 EOF
 
@@ -94,6 +107,6 @@ $preprocessor $TMP 2>/dev/null | sed -e '1,/^IGNORE$/d'
 
 cat <<EOF
 #else /* ! NCURSES_EXPANDED */
-void _nc_expanded(void) { }
+NCURSES_EXPORT(void) _nc_expanded (void) { }
 #endif /* NCURSES_EXPANDED */
 EOF