[GEN][ZH] Fix Clang, GCC compile errors from static enum declarations (#1053)

Caball009 · web-flow · commit d981516dceaa · 2025-06-11T22:24:59.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp
@@ -54,7 +54,7 @@
 #endif
 
 // PRIVATE ////////////////////////////////////////////////////////////////////////////////////////
-static enum CommandStatus
+enum CommandStatus
 {
 	COMMAND_INCOMPLETE = 0,
 	COMMAND_COMPLETE
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
@@ -52,7 +52,7 @@
 
 LookAtTranslator *TheLookAtTranslator = NULL;
 
-static enum
+enum
 {
 	DIR_UP = 0,
 	DIR_DOWN,
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp
@@ -69,7 +69,7 @@
 #endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-static enum {
+enum {
 	COLUMN_NAME = 0,
 	COLUMN_MAP,
 	COLUMN_LADDER,
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
@@ -121,7 +121,7 @@ class BuddyThreadClass : public ThreadClass
 	std::string m_nick, m_email, m_pass;
 };
 
-static enum CallbackType
+enum CallbackType
 {
 	CALLBACK_CONNECT,
 	CALLBACK_ERROR,
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
@@ -508,7 +508,7 @@ Int PeerThreadClass::findServer( SBServer server )
 	return addServerToMap(server);
 }
 
-static enum CallbackType
+enum CallbackType
 {
 	CALLBACK_CONNECT,
 	CALLBACK_ERROR,
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp
@@ -54,7 +54,7 @@
 #endif
 
 // PRIVATE ////////////////////////////////////////////////////////////////////////////////////////
-static enum CommandStatus
+enum CommandStatus
 {
 	COMMAND_INCOMPLETE = 0,
 	COMMAND_COMPLETE
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
@@ -52,7 +52,7 @@
 
 LookAtTranslator *TheLookAtTranslator = NULL;
 
-static enum
+enum
 {
 	DIR_UP = 0,
 	DIR_DOWN,
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp
@@ -70,7 +70,7 @@
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 // Note: if you add more columns, you must modify the .wnd files and change the listbox properties (yuck!)
-static enum {
+enum {
 	COLUMN_NAME = 0,
 	COLUMN_MAP,
 	COLUMN_LADDER,
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
@@ -121,7 +121,7 @@ class BuddyThreadClass : public ThreadClass
 	std::string m_nick, m_email, m_pass;
 };
 
-static enum CallbackType
+enum CallbackType
 {
 	CALLBACK_CONNECT,
 	CALLBACK_ERROR,
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
@@ -513,7 +513,7 @@ Int PeerThreadClass::findServer( SBServer server )
 	return addServerToMap(server);
 }
 
-static enum CallbackType
+enum CallbackType
 {
 	CALLBACK_CONNECT,
 	CALLBACK_ERROR,

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`#endif`
`55`	`55`
`56`	`56`	`// PRIVATE ////////////////////////////////////////////////////////////////////////////////////////`
`57`		`-static enum CommandStatus`
	`57`	`+enum CommandStatus`
`58`	`58`	`{`
`59`	`59`	`COMMAND_INCOMPLETE = 0,`
`60`	`60`	`COMMAND_COMPLETE`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`
`53`	`53`	`LookAtTranslator *TheLookAtTranslator = NULL;`
`54`	`54`
`55`		`-static enum`
	`55`	`+enum`
`56`	`56`	`{`
`57`	`57`	`DIR_UP = 0,`
`58`	`58`	`DIR_DOWN,`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ class BuddyThreadClass : public ThreadClass`
`121`	`121`	`std::string m_nick, m_email, m_pass;`
`122`	`122`	`};`
`123`	`123`
`124`		`-static enum CallbackType`
	`124`	`+enum CallbackType`
`125`	`125`	`{`
`126`	`126`	`CALLBACK_CONNECT,`
`127`	`127`	`CALLBACK_ERROR,`
Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,7 @@ Int PeerThreadClass::findServer( SBServer server )`
`508`	`508`	`return addServerToMap(server);`
`509`	`509`	`}`
`510`	`510`
`511`		`-static enum CallbackType`
	`511`	`+enum CallbackType`
`512`	`512`	`{`
`513`	`513`	`CALLBACK_CONNECT,`
`514`	`514`	`CALLBACK_ERROR,`
Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ Int PeerThreadClass::findServer( SBServer server )`
`513`	`513`	`return addServerToMap(server);`
`514`	`514`	`}`
`515`	`515`
`516`		`-static enum CallbackType`
	`516`	`+enum CallbackType`
`517`	`517`	`{`
`518`	`518`	`CALLBACK_CONNECT,`
`519`	`519`	`CALLBACK_ERROR,`