Merge branch 'master' into nhmall-booktribute

Conflicts: sys/winnt/Makefile.msc
2015-03-21 10:59:49 -04:00
parent d7ff451301 297e7c6d5f
commit a0d3224834
21 changed files with 945 additions and 218 deletions
--- a/src/allmain.c
+++ b/src/allmain.c
@@ -535,11 +535,11 @@ newgame()
 #endif
 	program_state.something_worth_saving++;	/* useful data now exists */

-	u.urealtime.realtime = (time_t)0L;
+	urealtime.realtime = (time_t)0L;
 #if defined(BSD) && !defined(POSIX_TYPES)
-        (void) time((long *)&u.urealtime.restored);
+        (void) time((long *)&urealtime.restored);
 #else
-        (void) time(&u.urealtime.restored);
+        (void) time(&urealtime.restored);
 #endif

 	/* Success! */