Import Upstream version 5d6upstream/5d6

1 files changed, 13 insertions, 10 deletions

diff --git a/crs.c b/crs.c
index bab7c52..665b0bd 100644
--- a/crs.c
+++ b/crs.c
@@ -15,26 +15,26 @@
  * the Free Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  *
  * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
+ * for additional uses of the text contained in its release of SCM.
  *
- * The exception is that, if you link the GUILE library with other files
+ * The exception is that, if you link the SCM library with other files
  * to produce an executable, this does not by itself cause the
  * resulting executable to be covered by the GNU General Public License.
  * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
+ * linking the SCM library code into it.
  *
  * This exception does not however invalidate any other reasons why
  * the executable file might be covered by the GNU General Public License.
  *
  * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
+ * Free Software Foundation under the name SCM.  If you copy
  * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
+ * SCM, as the General Public License permits, the exception does
  * not apply to the code that you add in this way.  To avoid misleading
  * anyone as to the status of such modified files, you must delete
  * this exception notice from them.
  *
- * If you write modifications of your own for GUILE, it is your choice
+ * If you write modifications of your own for SCM, it is your choice
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.
  */
@@ -43,7 +43,12 @@
    Author: Aubrey Jaffer */
 
 #include "scm.h"
-#include <curses.h>
+
+#ifdef __FreeBSD__
+# include <ncurses.h>
+#else
+# include <curses.h>
+#endif
 
 #ifdef MWC
 # include <unctrl.h>
@@ -93,10 +98,8 @@ SCM mkwindow(win)
 {
   SCM z;
   if (NULL==win) return BOOL_F;
-  NEWCELL(z);
   DEFER_INTS;
-  SETCHARS(z, win);
-  CAR(z) = scm_port_entry(tc16_window, OPN | RDNG | WRTNG);
+  z = scm_port_entry((FILE *)win, tc16_window, OPN | RDNG | WRTNG);
   ALLOW_INTS;
   return z;
 }