program_state moved to g.

sys/unix/unixmain.c

@@ -191,7 +191,7 @@ char *argv[];
      * It seems you really want to play.
      */
     u.uhp = 1; /* prevent RIP on early quits */
-    program_state.preserve_locks = 1;
+    g.program_state.preserve_locks = 1;
 #ifndef NO_SIGNAL
     sethanguphandler((SIG_RET_TYPE) hangup);
 #endif
@@ -277,7 +277,7 @@ attempt_restore:
      */
     if (*g.plname) {
         getlock();
-        program_state.preserve_locks = 0; /* after getlock() */
+        g.program_state.preserve_locks = 0; /* after getlock() */
     }
 
     if (*g.plname && (fd = restore_saved_game()) >= 0) {

sys/unix/unixunix.c

@@ -75,7 +75,7 @@ eraseoldlocks()
 {
     register int i;
 
-    program_state.preserve_locks = 0; /* not required but shows intent */
+    g.program_state.preserve_locks = 0; /* not required but shows intent */
     /* cannot use maxledgerno() here, because we need to find a lock name
      * before starting everything (including the dungeon initialization
      * that sets astral_level, needed for maxledgerno()) up