Menu
▾
▴
SF.net SVN: bzflag:[22808] trunk/bzflag
|
From: <bul...@us...> - 2013-06-14 20:12:44
|
Revision: 22808
http://sourceforge.net/p/bzflag/code/22808
Author: bullet_catcher
Date: 2013-06-14 20:12:41 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
Rename bzsignal.c to bzsignal.cxx so it will be compiled with the C++ compiler the same as all of the other source code.
Modified Paths:
--------------
trunk/bzflag/MSVC/build/common.vcxproj
trunk/bzflag/Xcode/BZFlag.xcodeproj/project.pbxproj
trunk/bzflag/src/common/Makefile.am
Added Paths:
-----------
trunk/bzflag/src/common/bzsignal.cxx
Removed Paths:
-------------
trunk/bzflag/src/common/bzsignal.c
Modified: trunk/bzflag/MSVC/build/common.vcxproj
===================================================================
--- trunk/bzflag/MSVC/build/common.vcxproj 2013-06-11 06:12:24 UTC (rev 22807)
+++ trunk/bzflag/MSVC/build/common.vcxproj 2013-06-14 20:12:41 UTC (rev 22808)
@@ -236,7 +236,7 @@
<ClCompile Include="..\..\src\common\bzfio.cxx" />
<ClCompile Include="..\..\src\common\bzglob.cxx" />
<ClCompile Include="..\..\src\common\BzPNG.cxx" />
- <ClCompile Include="..\..\src\common\bzsignal.c">
+ <ClCompile Include="..\..\src\common\bzsignal.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: trunk/bzflag/Xcode/BZFlag.xcodeproj/project.pbxproj
===================================================================
--- trunk/bzflag/Xcode/BZFlag.xcodeproj/project.pbxproj 2013-06-11 06:12:24 UTC (rev 22807)
+++ trunk/bzflag/Xcode/BZFlag.xcodeproj/project.pbxproj 2013-06-14 20:12:41 UTC (rev 22808)
@@ -203,7 +203,7 @@
0357A7C71670AFE30056C938 /* bzfio.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 03554447166C846F008806E9 /* bzfio.cxx */; };
0357A7C81670AFE30056C938 /* bzglob.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 03554448166C846F008806E9 /* bzglob.cxx */; };
0357A7C91670AFE30056C938 /* BzPNG.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 03554449166C846F008806E9 /* BzPNG.cxx */; };
- 0357A7CA1670AFE30056C938 /* bzsignal.c in Sources */ = {isa = PBXBuildFile; fileRef = 0355444A166C846F008806E9 /* bzsignal.c */; };
+ 0357A7CA1670AFE30056C938 /* bzsignal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0355444A166C846F008806E9 /* bzsignal.cxx */; };
0357A7CB1670AFE30056C938 /* CommandManager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0355444B166C846F008806E9 /* CommandManager.cxx */; };
0357A7CC1670AFE30056C938 /* ConfigFileManager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0355444C166C846F008806E9 /* ConfigFileManager.cxx */; };
0357A7CD1670AFE30056C938 /* Country.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0355444D166C846F008806E9 /* Country.cxx */; };
@@ -1708,7 +1708,7 @@
03554447166C846F008806E9 /* bzfio.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = bzfio.cxx; sourceTree = "<group>"; };
03554448166C846F008806E9 /* bzglob.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = bzglob.cxx; sourceTree = "<group>"; };
03554449166C846F008806E9 /* BzPNG.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = BzPNG.cxx; sourceTree = "<group>"; };
- 0355444A166C846F008806E9 /* bzsignal.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = bzsignal.c; sourceTree = "<group>"; };
+ 0355444A166C846F008806E9 /* bzsignal.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = bzsignal.cxx; sourceTree = "<group>"; };
0355444B166C846F008806E9 /* CommandManager.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CommandManager.cxx; sourceTree = "<group>"; };
0355444C166C846F008806E9 /* ConfigFileManager.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ConfigFileManager.cxx; sourceTree = "<group>"; };
0355444D166C846F008806E9 /* Country.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Country.cxx; sourceTree = "<group>"; };
@@ -3218,7 +3218,7 @@
03554447166C846F008806E9 /* bzfio.cxx */,
03554448166C846F008806E9 /* bzglob.cxx */,
03554449166C846F008806E9 /* BzPNG.cxx */,
- 0355444A166C846F008806E9 /* bzsignal.c */,
+ 0355444A166C846F008806E9 /* bzsignal.cxx */,
0355444B166C846F008806E9 /* CommandManager.cxx */,
0355444C166C846F008806E9 /* ConfigFileManager.cxx */,
0355444D166C846F008806E9 /* Country.cxx */,
@@ -5611,7 +5611,7 @@
0357A7C71670AFE30056C938 /* bzfio.cxx in Sources */,
0357A7C81670AFE30056C938 /* bzglob.cxx in Sources */,
0357A7C91670AFE30056C938 /* BzPNG.cxx in Sources */,
- 0357A7CA1670AFE30056C938 /* bzsignal.c in Sources */,
+ 0357A7CA1670AFE30056C938 /* bzsignal.cxx in Sources */,
0357A7CB1670AFE30056C938 /* CommandManager.cxx in Sources */,
0357A7CC1670AFE30056C938 /* ConfigFileManager.cxx in Sources */,
0357A7CD1670AFE30056C938 /* Country.cxx in Sources */,
Modified: trunk/bzflag/src/common/Makefile.am
===================================================================
--- trunk/bzflag/src/common/Makefile.am 2013-06-11 06:12:24 UTC (rev 22807)
+++ trunk/bzflag/src/common/Makefile.am 2013-06-14 20:12:41 UTC (rev 22808)
@@ -41,7 +41,7 @@
bz_Locale.cxx \
bzfio.cxx \
bzglob.cxx \
- bzsignal.c \
+ bzsignal.cxx \
cURLManager.cxx \
global.cxx \
md5.cxx \
Deleted: trunk/bzflag/src/common/bzsignal.c
===================================================================
--- trunk/bzflag/src/common/bzsignal.c 2013-06-11 06:12:24 UTC (rev 22807)
+++ trunk/bzflag/src/common/bzsignal.c 2013-06-14 20:12:41 UTC (rev 22808)
@@ -1,56 +0,0 @@
-/* bzflag
- * Copyright (c) 1993-2013 Tim Riker
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the license found in the file
- * named COPYING that should have accompanied this file.
- *
- * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include "bzsignal.h"
-
-/* Unix systems implemnt signal() differently */
-/* modified from "UNIX Network Programming" */
-SIG_PF bzSignal(int signo, SIG_PF func)
-{
-#ifdef _WIN32
- return signal(signo, func);
-#else /* _WIN32 */
- struct sigaction act, oact;
-
- act.sa_handler = func;
- sigemptyset(&act.sa_mask);
-#ifdef SA_NODEFER
- act.sa_flags = SA_NODEFER;
-#else
- act.sa_flags = 0;
-#endif
- if (signo == SIGALRM) {
-#ifdef SA_INTERRUPT
- /* SunOS 4.x */
- act.sa_flags |= SA_INTERRUPT;
-#endif
- } else {
-#ifdef SA_RESTART
- /* SVR4, 4.4BSD */
- act.sa_flags |= SA_RESTART;
-#endif
- }
- if (sigaction(signo, &act, &oact) < 0)
- return SIG_ERR;
- return oact.sa_handler;
-#endif /* _WIN32 */
-}
-
-/*
- * Local Variables: ***
- * mode:C ***
- * tab-width: 8 ***
- * c-basic-offset: 2 ***
- * indent-tabs-mode: t ***
- * End: ***
- * ex: shiftwidth=2 tabstop=8
- */
Copied: trunk/bzflag/src/common/bzsignal.cxx (from rev 22807, trunk/bzflag/src/common/bzsignal.c)
===================================================================
--- trunk/bzflag/src/common/bzsignal.cxx (rev 0)
+++ trunk/bzflag/src/common/bzsignal.cxx 2013-06-14 20:12:41 UTC (rev 22808)
@@ -0,0 +1,56 @@
+/* bzflag
+ * Copyright (c) 1993-2013 Tim Riker
+ *
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the license found in the file
+ * named COPYING that should have accompanied this file.
+ *
+ * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "bzsignal.h"
+
+/* Unix systems implemnt signal() differently */
+/* modified from "UNIX Network Programming" */
+SIG_PF bzSignal(int signo, SIG_PF func)
+{
+#ifdef _WIN32
+ return signal(signo, func);
+#else /* _WIN32 */
+ struct sigaction act, oact;
+
+ act.sa_handler = func;
+ sigemptyset(&act.sa_mask);
+#ifdef SA_NODEFER
+ act.sa_flags = SA_NODEFER;
+#else
+ act.sa_flags = 0;
+#endif
+ if (signo == SIGALRM) {
+#ifdef SA_INTERRUPT
+ /* SunOS 4.x */
+ act.sa_flags |= SA_INTERRUPT;
+#endif
+ } else {
+#ifdef SA_RESTART
+ /* SVR4, 4.4BSD */
+ act.sa_flags |= SA_RESTART;
+#endif
+ }
+ if (sigaction(signo, &act, &oact) < 0)
+ return SIG_ERR;
+ return oact.sa_handler;
+#endif /* _WIN32 */
+}
+
+/*
+ * Local Variables: ***
+ * mode:C ***
+ * tab-width: 8 ***
+ * c-basic-offset: 2 ***
+ * indent-tabs-mode: t ***
+ * End: ***
+ * ex: shiftwidth=2 tabstop=8
+ */
Property changes on: trunk/bzflag/src/common/bzsignal.cxx
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
