From: unknown <shira@.(none)>
Date: Sun, 18 Sep 2011 15:35:08 +0000 (+0900)
Subject: modify for VS2008
X-Git-Url: http://git.osdn.net/view?p=nethackexpress%2Ftrunk.git;a=commitdiff_plain;h=0a316301c2735e41fe50fdd26c638d33b35f206a;hp=91caa38068974169c29658860ee7a2256f06ff93

modify for VS2008
---

diff --git a/build/NetHackW.vcproj b/build/NetHackW.vcproj
index 4da848a..6f328f1 100644
--- a/build/NetHackW.vcproj
+++ b/build/NetHackW.vcproj
@@ -3,7 +3,8 @@
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="NetHackW"
-	ProjectGUID="{0263CD61-31D2-493D-B9D7-B80113D51951}"
+	ProjectGUID="{4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}"
+	RootNamespace="NetHackW"
 	TargetFrameworkVersion="0"
 	>
 	<Platforms>
@@ -47,7 +48,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Gs /Oi- "
+				AdditionalOptions="/wd 4996"
 				InlineFunctionExpansion="1"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
@@ -149,6 +150,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd 4996"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\win\win32,..\include,..\sys\winnt,..\sys\share,..\win\share"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS"
diff --git a/build/makedefs.vcproj b/build/makedefs.vcproj
index 960de39..1f090c8 100644
--- a/build/makedefs.vcproj
+++ b/build/makedefs.vcproj
@@ -3,7 +3,8 @@
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="makedefs"
-	ProjectGUID="{04709C3E-D077-4706-B991-D710C26FE86E}"
+	ProjectGUID="{ABE56163-8CD5-407B-AB84-B2E08AC7D44D}"
+	RootNamespace="makedefs"
 	TargetFrameworkVersion="0"
 	>
 	<Platforms>
@@ -43,6 +44,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd 4996"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories=".,..\include,..\sys\winnt"
@@ -134,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd 4996"
 				Optimization="0"
 				AdditionalIncludeDirectories=".,..\include,..\sys\winnt"
 				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS"
diff --git a/include/ntconf.h b/include/ntconf.h
index dea4733..6cacc66 100644
--- a/include/ntconf.h
+++ b/include/ntconf.h
@@ -107,7 +107,9 @@ extern void FDECL(interject, (int));
 #define Rand()	rand()
 #endif
 
-#define FCMASK	0660	/* file creation mask */
+//#define FCMASK	0660	/* file creation mask */
+#define FCMASK (0x0180)
+
 #define regularize	nt_regularize
 #define HLOCK "NHPERM"
 
diff --git a/nethack.sln b/nethack.sln
index 1aa08d9..ae8710d 100644
--- a/nethack.sln
+++ b/nethack.sln
@@ -1,12 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "build\NetHackW.vcproj", "{0263CD61-31D2-493D-B9D7-B80113D51951}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "build\NetHackW.vcproj", "{4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{26FA0C16-2813-4976-B2CC-0C4EF12D00C5} = {26FA0C16-2813-4976-B2CC-0C4EF12D00C5}
 		{DCB301B2-6766-44F4-BD76-AA1F2526F6C7} = {DCB301B2-6766-44F4-BD76-AA1F2526F6C7}
 		{F36B67E6-91F8-4023-AA15-5D896AAF2EC0} = {F36B67E6-91F8-4023-AA15-5D896AAF2EC0}
-		{04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}
+		{ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}
 		{4BC0B0F2-A002-42E1-BA0B-EC5425566312} = {4BC0B0F2-A002-42E1-BA0B-EC5425566312}
 		{BA9A3FD6-9E18-400F-9113-B09D7EDCF18D} = {BA9A3FD6-9E18-400F-9113-B09D7EDCF18D}
 		{388B03B5-6B10-4C0F-ACEB-5FBF4F03385B} = {388B03B5-6B10-4C0F-ACEB-5FBF4F03385B}
@@ -19,14 +19,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgncomp", "build\dgncomp.vc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgnstuff", "build\dgnstuff.vcproj", "{D86C7AE7-2F17-4808-900B-92F8FEB9C0D8}"
 	ProjectSection(ProjectDependencies) = postProject
-		{04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}
+		{ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb_main", "build\dlb_main.vcproj", "{DCB301B2-6766-44F4-BD76-AA1F2526F6C7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{26FA0C16-2813-4976-B2CC-0C4EF12D00C5} = {26FA0C16-2813-4976-B2CC-0C4EF12D00C5}
 		{F36B67E6-91F8-4023-AA15-5D896AAF2EC0} = {F36B67E6-91F8-4023-AA15-5D896AAF2EC0}
-		{04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}
+		{ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "build\levcomp.vcproj", "{F36B67E6-91F8-4023-AA15-5D896AAF2EC0}"
@@ -36,14 +36,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "build\levcomp.vc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levstuff", "build\levstuff.vcproj", "{6224BEE2-0883-426E-ADFD-F0293EB387F6}"
 	ProjectSection(ProjectDependencies) = postProject
-		{04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}
+		{ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "build\makedefs.vcproj", "{04709C3E-D077-4706-B991-D710C26FE86E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "build\makedefs.vcproj", "{ABE56163-8CD5-407B-AB84-B2E08AC7D44D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "build\recover.vcproj", "{E5033EEA-B743-4678-A4A8-2ADDE29F297D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}
+		{ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}
 		{DCB301B2-6766-44F4-BD76-AA1F2526F6C7} = {DCB301B2-6766-44F4-BD76-AA1F2526F6C7}
 	EndProjectSection
 EndProject
@@ -64,10 +64,10 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0263CD61-31D2-493D-B9D7-B80113D51951}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0263CD61-31D2-493D-B9D7-B80113D51951}.Debug|Win32.Build.0 = Debug|Win32
-		{0263CD61-31D2-493D-B9D7-B80113D51951}.Release|Win32.ActiveCfg = Release|Win32
-		{0263CD61-31D2-493D-B9D7-B80113D51951}.Release|Win32.Build.0 = Release|Win32
+		{4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}.Debug|Win32.Build.0 = Debug|Win32
+		{4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}.Release|Win32.ActiveCfg = Release|Win32
+		{4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}.Release|Win32.Build.0 = Release|Win32
 		{26FA0C16-2813-4976-B2CC-0C4EF12D00C5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{26FA0C16-2813-4976-B2CC-0C4EF12D00C5}.Debug|Win32.Build.0 = Debug|Win32
 		{26FA0C16-2813-4976-B2CC-0C4EF12D00C5}.Release|Win32.ActiveCfg = Release|Win32
@@ -88,10 +88,10 @@ Global
 		{6224BEE2-0883-426E-ADFD-F0293EB387F6}.Debug|Win32.Build.0 = Debug|Win32
 		{6224BEE2-0883-426E-ADFD-F0293EB387F6}.Release|Win32.ActiveCfg = Release|Win32
 		{6224BEE2-0883-426E-ADFD-F0293EB387F6}.Release|Win32.Build.0 = Release|Win32
-		{04709C3E-D077-4706-B991-D710C26FE86E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{04709C3E-D077-4706-B991-D710C26FE86E}.Debug|Win32.Build.0 = Debug|Win32
-		{04709C3E-D077-4706-B991-D710C26FE86E}.Release|Win32.ActiveCfg = Release|Win32
-		{04709C3E-D077-4706-B991-D710C26FE86E}.Release|Win32.Build.0 = Release|Win32
+		{ABE56163-8CD5-407B-AB84-B2E08AC7D44D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{ABE56163-8CD5-407B-AB84-B2E08AC7D44D}.Debug|Win32.Build.0 = Debug|Win32
+		{ABE56163-8CD5-407B-AB84-B2E08AC7D44D}.Release|Win32.ActiveCfg = Release|Win32
+		{ABE56163-8CD5-407B-AB84-B2E08AC7D44D}.Release|Win32.Build.0 = Release|Win32
 		{E5033EEA-B743-4678-A4A8-2ADDE29F297D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E5033EEA-B743-4678-A4A8-2ADDE29F297D}.Debug|Win32.Build.0 = Debug|Win32
 		{E5033EEA-B743-4678-A4A8-2ADDE29F297D}.Release|Win32.ActiveCfg = Release|Win32
diff --git a/util/makedefs.c b/util/makedefs.c
index 23dace2..4cac55b 100644
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -543,8 +543,12 @@ const char *build_date;
 void
 do_date()
 {
+#ifdef KR1ED
 	long clocktim = 0;
-	char *c, cbuf[60], buf[BUFSZ];
+#else
+	time_t clocktim;
+#endif
+	char *c, cbuf[256], buf[BUFSZ];
 	const char *ul_sfx;
 
 	filename[0]='\0';