X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_initscr.c;h=334682fab71d187bc8c11fbca08988cb9fc5d0a0;hp=ef360c03b6420210228f6652c70a96a5db4328b2;hb=ef2d99350e0d3e4606171b5b1466ab92ec440205;hpb=396a05943b7da5039dd15d79c4385c7d2a75d6d4

diff --git a/ncurses/base/lib_initscr.c b/ncurses/base/lib_initscr.c
index ef360c03..334682fa 100644
--- a/ncurses/base/lib_initscr.c
+++ b/ncurses/base/lib_initscr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2008 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            *
@@ -45,7 +45,7 @@
 #include <sys/termio.h>		/* needed for ISC */
 #endif
 
-MODULE_ID("$Id: lib_initscr.c,v 1.36 2008/04/12 18:11:36 tom Exp $")
+MODULE_ID("$Id: lib_initscr.c,v 1.39 2009/02/14 20:55:49 tom Exp $")
 
 NCURSES_EXPORT(WINDOW *)
 initscr(void)
@@ -57,7 +57,9 @@ initscr(void)
     START_TRACE();
     T((T_CALLED("initscr()")));
 
-    _nc_lock_global(set_SP);
+    _nc_init_pthreads();
+    _nc_lock_global(curses);
+
     /* Portable applications must not call initscr() more than once */
     if (!_nc_globals.init_screen) {
 	_nc_globals.init_screen = TRUE;
@@ -88,10 +90,14 @@ initscr(void)
 	}
 
 	/* def_shell_mode - done in newterm/_nc_setupscreen */
+#if NCURSES_SP_FUNCS
+	NCURSES_SP_NAME(def_prog_mode) (CURRENT_SCREEN);
+#else
 	def_prog_mode();
+#endif
     }
     result = stdscr;
-    _nc_unlock_global(set_SP);
+    _nc_unlock_global(curses);
 
     returnWin(result);
 }