ncurses 5.7 - patch 20090510

[ncurses.git] / ncurses / tinfo / lib_print.c

diff --git a/ncurses/tinfo/lib_print.c b/ncurses/tinfo/lib_print.c
index 3a98bc96a2fc0fb442dff318ace59b050208d05a..6f4666730cfd911d460d20838f92010855788f47 100644 (file)
--- a/ncurses/tinfo/lib_print.c
+++ b/ncurses/tinfo/lib_print.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2000,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -35,12 +35,19 @@
 
 #include <term.h>
 
 
 #include <term.h>
 

-MODULE_ID("$Id: lib_print.c,v 1.15 2002/08/17 23:41:34 tom Exp $")
+#ifndef CUR
+#define CUR SP_TERMTYPE 
+#endif
+
+MODULE_ID("$Id: lib_print.c,v 1.18 2009/05/10 00:48:29 tom Exp $")

 
 NCURSES_EXPORT(int)
 mcprint(char *data, int len)
 /* ship binary character data to the printer via mc4/mc5/mc5p */
 {
 
 NCURSES_EXPORT(int)
 mcprint(char *data, int len)
 /* ship binary character data to the printer via mc4/mc5/mc5p */
 {

+#if NCURSES_SP_FUNCS
+    SCREEN *sp = CURRENT_SCREEN;
+#endif

     char *mybuf, *switchon;
     size_t onsize, offsize, res;
 
     char *mybuf, *switchon;
     size_t onsize, offsize, res;
 


@@ -51,7 +58,7 @@ mcprint(char *data, int len)
     }
 
     if (prtr_non) {
     }
 
     if (prtr_non) {

-       switchon = tparm(prtr_non, len);
+       switchon = TPARM_1(prtr_non, len);

        onsize = strlen(switchon);
        offsize = 0;
     } else {
        onsize = strlen(switchon);
        offsize = 0;
     } else {