fix: add CppMacros.h include to LISTNODE.h for nullptr compatibility

bobtista · bobtista · commit a966f2a96ad4 · 2025-12-04T20:49:41.000-05:00
diff --git a/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.h b/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.h
@@ -40,6 +40,7 @@
 ** Includes
 */
 #include	"assert.h"
+#include	<Utility/CppMacros.h>
 
 
 #ifdef __BORLANDC__
diff --git a/Core/Libraries/Source/WWVegas/WWLib/TARGA.cpp b/Core/Libraries/Source/WWVegas/WWLib/TARGA.cpp
@@ -61,6 +61,7 @@
 ****************************************************************************/
 
 #include "TARGA.h"
+#include <Utility/CppMacros.h>
 #ifndef TGA_USES_WWLIB_FILE_CLASSES
 #include "WWDebug/wwdebug.h"
 #endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.cpp b/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.cpp
@@ -35,6 +35,7 @@
 ******************************************************************************/
 
 #include "WWCOMUtil.h"
+#include <Utility/CppMacros.h>
 
 /******************************************************************************
 *
diff --git a/Core/Libraries/Source/WWVegas/WWLib/strtok_r.cpp b/Core/Libraries/Source/WWVegas/WWLib/strtok_r.cpp
@@ -37,6 +37,7 @@
 
 #include "strtok_r.h"
 #include "stringex.h"
+#include <Utility/CppMacros.h>
 
 //
 // Replacement for strtok() that doesn't use a static to
diff --git a/Core/Tools/Babylon/Babylon.cpp b/Core/Tools/Babylon/Babylon.cpp
@@ -19,7 +19,6 @@
 // Babylon.cpp : Defines the class behaviors for the application.
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "Babylon.h"
 #include "BabylonDlg.h"
diff --git a/Core/Tools/Babylon/BabylonDlg.cpp b/Core/Tools/Babylon/BabylonDlg.cpp
@@ -20,7 +20,6 @@
 // BabylonDlg.cpp : implementation file
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "Babylon.h"
 #include "BabylonDlg.h"
diff --git a/Core/Tools/Babylon/TransDB.cpp b/Core/Tools/Babylon/TransDB.cpp
@@ -20,7 +20,6 @@
 // TransDB.cpp
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "TransDB.h"
 #include "BabylonDlg.h"
diff --git a/Core/Tools/Babylon/XLStuff.cpp b/Core/Tools/Babylon/XLStuff.cpp
@@ -20,8 +20,6 @@
 //	XLStuff.cpp
 //
 //
-
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "Babylon.h"
 #include "resource.h"
diff --git a/Core/Tools/Babylon/bin.cpp b/Core/Tools/Babylon/bin.cpp
@@ -20,7 +20,6 @@
 // Bin.cpp
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "bin.h"
 #include "assert.h"
diff --git a/Core/Tools/Babylon/expimp.cpp b/Core/Tools/Babylon/expimp.cpp
@@ -20,7 +20,6 @@
 // expimp.cpp
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "TransDB.h"
 #include "XLStuff.h"
diff --git a/Core/Tools/Babylon/iff.cpp b/Core/Tools/Babylon/iff.cpp
@@ -17,7 +17,6 @@
 */
 
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "sys/stat.h"
 #include "iff.h"
diff --git a/Core/Tools/Babylon/list.cpp b/Core/Tools/Babylon/list.cpp
@@ -21,7 +21,6 @@
 //
 
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include <assert.h>
 #include "list.h"
diff --git a/Core/Tools/Babylon/olestring.cpp b/Core/Tools/Babylon/olestring.cpp
@@ -21,7 +21,6 @@
 //
 
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include <assert.h>
 #include "olestring.h"
diff --git a/Core/Tools/CRCDiff/CRCDiff.cpp b/Core/Tools/CRCDiff/CRCDiff.cpp
@@ -16,7 +16,6 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Utility/CppMacros.h>
 #include "debug.h"
 #include "expander.h"
 #include "KVPair.h"
diff --git a/Core/Tools/ImagePacker/Source/ImageInfo.cpp b/Core/Tools/ImagePacker/Source/ImageInfo.cpp
@@ -41,8 +41,6 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
 
-#include <Utility/CppMacros.h>
-
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "ImageInfo.h"
 
diff --git a/Core/Tools/ImagePacker/Source/ImagePacker.cpp b/Core/Tools/ImagePacker/Source/ImagePacker.cpp
@@ -45,8 +45,6 @@
 #include <assert.h>
 #include <WWCommon.h>
 
-#include <Utility/CppMacros.h>
-
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
 #include "WWLib/TARGA.h"
diff --git a/Core/Tools/ImagePacker/Source/TexturePage.cpp b/Core/Tools/ImagePacker/Source/TexturePage.cpp
@@ -42,8 +42,6 @@
 #include <stdlib.h>
 #include <Utility/stdio_adapter.h>
 
-#include <Utility/CppMacros.h>
-
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
 #include "TexturePage.h"
diff --git a/Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp b/Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp
@@ -41,8 +41,6 @@
 #include <windows.h>
 #include <Utility/stdio_adapter.h>
 
-#include <Utility/CppMacros.h>
-
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "ImagePacker.h"
 #include "WinMain.h"
diff --git a/Core/Tools/W3DView/AdvancedAnimSheet.cpp b/Core/Tools/W3DView/AdvancedAnimSheet.cpp
@@ -19,7 +19,6 @@
 // AdvancedAnimSheet.cpp : implementation file
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "W3DView.h"
 #include "W3DViewDoc.h"
diff --git a/Core/Tools/W3DView/AssetInfo.cpp b/Core/Tools/W3DView/AssetInfo.cpp
@@ -35,7 +35,6 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "AssetInfo.h"
 //#include "HModel.h"
diff --git a/Core/Tools/W3DView/BoneMgrDialog.cpp b/Core/Tools/W3DView/BoneMgrDialog.cpp
@@ -19,7 +19,6 @@
 // BoneMgrDialog.cpp : implementation file
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "W3DView.h"
 #include "BoneMgrDialog.h"
diff --git a/Core/Tools/W3DView/ColorBar.cpp b/Core/Tools/W3DView/ColorBar.cpp
@@ -22,7 +22,6 @@
 //
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "ColorBar.h"
 #include "ColorUtils.h"
diff --git a/Core/Tools/W3DView/ColorPickerDialogClass.cpp b/Core/Tools/W3DView/ColorPickerDialogClass.cpp
@@ -19,7 +19,6 @@
 // ColorPickerDialogClass.cpp : implementation file
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "ColorPickerDialogClass.h"
 #include "ColorBar.h"
diff --git a/Core/Tools/W3DView/EmitterInstanceList.cpp b/Core/Tools/W3DView/EmitterInstanceList.cpp
@@ -31,7 +31,6 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "EmitterInstanceList.h"
 #include "Utils.h"
diff --git a/Core/Tools/W3DView/EmitterPropertySheet.cpp b/Core/Tools/W3DView/EmitterPropertySheet.cpp
@@ -30,7 +30,6 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "W3DView.h"
 #include "EmitterPropertySheet.h"
diff --git a/Core/Tools/W3DView/Globals.cpp b/Core/Tools/W3DView/Globals.cpp
@@ -24,7 +24,6 @@
 //
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 
 #include "Globals.h"
diff --git a/Core/Tools/W3DView/GraphicView.cpp b/Core/Tools/W3DView/GraphicView.cpp
@@ -19,7 +19,6 @@
 // GraphicView.cpp : implementation file
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "W3DView.h"
 #include "GraphicView.h"
diff --git a/Core/Tools/W3DView/MainFrm.cpp b/Core/Tools/W3DView/MainFrm.cpp
@@ -19,7 +19,6 @@
 // MainFrm.cpp : implementation of the CMainFrame class
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "W3DView.h"
 
diff --git a/Core/Tools/W3DView/OpacityVectorDialog.cpp b/Core/Tools/W3DView/OpacityVectorDialog.cpp
@@ -19,7 +19,6 @@
 // OpacityVectorDialog.cpp : implementation file
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "W3DView.h"
 #include "OpacityVectorDialog.h"
diff --git a/Core/Tools/W3DView/PlaySoundDialog.cpp b/Core/Tools/W3DView/PlaySoundDialog.cpp
@@ -19,7 +19,6 @@
 // PlaySoundDialog.cpp : implementation file
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "PlaySoundDialog.h"
 #include "Utils.h"
diff --git a/Core/Tools/W3DView/RingPropertySheet.cpp b/Core/Tools/W3DView/RingPropertySheet.cpp
@@ -19,7 +19,6 @@
 // RingPropertySheet.cpp : implementation file
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "W3DView.h"
 #include "RingPropertySheet.h"
diff --git a/Core/Tools/W3DView/RingSizePropPage.cpp b/Core/Tools/W3DView/RingSizePropPage.cpp
@@ -19,7 +19,6 @@
 // RingSizePropPage.cpp : implementation file
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "W3DView.h"
 #include "RingSizePropPage.h"
diff --git a/Core/Tools/W3DView/ScreenCursor.cpp b/Core/Tools/W3DView/ScreenCursor.cpp
@@ -31,7 +31,6 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "ScreenCursor.h"
 #include "Utils.h"
diff --git a/Core/Tools/W3DView/SoundEditDialog.cpp b/Core/Tools/W3DView/SoundEditDialog.cpp
@@ -34,7 +34,6 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "SoundEditDialog.h"
 #include "soundrobj.h"
diff --git a/Core/Tools/W3DView/SpherePropertySheet.cpp b/Core/Tools/W3DView/SpherePropertySheet.cpp
@@ -19,7 +19,6 @@
 // SpherePropertySheet.cpp : implementation file
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "W3DView.h"
 #include "SpherePropertySheet.h"
diff --git a/Core/Tools/W3DView/SphereSizePropPage.cpp b/Core/Tools/W3DView/SphereSizePropPage.cpp
@@ -19,7 +19,6 @@
 // SphereSizePropPage.cpp : implementation file
 //
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "W3DView.h"
 #include "SphereSizePropPage.h"
diff --git a/Core/Tools/W3DView/Utils.cpp b/Core/Tools/W3DView/Utils.cpp
@@ -24,7 +24,6 @@
 //
 
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "W3DViewDoc.h"
 #include "MainFrm.h"
diff --git a/Core/Tools/W3DView/Vector3RndCombo.cpp b/Core/Tools/W3DView/Vector3RndCombo.cpp
@@ -31,7 +31,6 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "Vector3RndCombo.h"
 #include "v3_rnd.h"
diff --git a/Core/Tools/W3DView/ViewerScene.cpp b/Core/Tools/W3DView/ViewerScene.cpp
@@ -35,7 +35,6 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include <Utility/CppMacros.h>
 #include "StdAfx.h"
 #include "ViewerScene.h"
 #include "camera.h"
diff --git a/Core/Tools/mangler/mangler.cpp b/Core/Tools/mangler/mangler.cpp
@@ -22,8 +22,6 @@
 #include <signal.h>
 #ifdef _WIN32
 #include <process.h> // *MUST* be included before ANY Wnet/Wlib headers if _REENTRANT is defined
-
-#include <Utility/CppMacros.h>
 #endif
 
 #include "mangler.h"
diff --git a/Core/Tools/mangler/manglertest.cpp b/Core/Tools/mangler/manglertest.cpp
@@ -22,8 +22,6 @@
 #include <signal.h>
 #ifdef _WIN32
 #include <process.h> // *MUST* be included before ANY Wnet/Wlib headers if _REENTRANT is defined
-
-#include <Utility/CppMacros.h>
 #endif
 
 #include "mangler.h"
diff --git a/Core/Tools/mangler/wlib/configfile.cpp b/Core/Tools/mangler/wlib/configfile.cpp
@@ -38,7 +38,6 @@ the left is used for retrieval and it must be specified in uppercase
 for the 'get' functions. E.g. getString("KEY",valWstring);
 \***************************************************************************/
 
-#include <Utility/CppMacros.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
diff --git a/Core/Tools/mangler/wlib/critsec.cpp b/Core/Tools/mangler/wlib/critsec.cpp
@@ -16,7 +16,6 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Utility/CppMacros.h>
 #include "critsec.h"
 #include <assert.h>
 #include "wlib/wdebug.h"
diff --git a/Core/Tools/mangler/wlib/streamer.cpp b/Core/Tools/mangler/wlib/streamer.cpp
@@ -17,7 +17,6 @@
 */
 
 
-#include <Utility/CppMacros.h>
 #include "streamer.h"
 #ifdef _WIN32
   #include <windows.h>
diff --git a/Core/Tools/mangler/wlib/threadfac.cpp b/Core/Tools/mangler/wlib/threadfac.cpp
@@ -18,7 +18,6 @@
 
 #define THREADFAC_CODE
 
-#include <Utility/CppMacros.h>
 #include "threadfac.h"
 
 int       Runnable::ThreadCount_ = 0;
diff --git a/Core/Tools/mangler/wlib/wdebug.cpp b/Core/Tools/mangler/wlib/wdebug.cpp
@@ -17,8 +17,6 @@
 */
 
 #include <stdlib.h>
-
-#include <Utility/CppMacros.h>
 #include "wdebug.h"
 #include "streamer.h"
 #include "odevice.h"
diff --git a/Core/Tools/mangler/wlib/wstring.cpp b/Core/Tools/mangler/wlib/wstring.cpp
@@ -29,7 +29,6 @@ A fairly typical string class.  This string class always copies any input
 string to it's own memory (for assignment or construction).
 \***************************************************************************/
 
-#include <Utility/CppMacros.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/Core/Tools/mangler/wnet/field.cpp b/Core/Tools/mangler/wnet/field.cpp
@@ -32,8 +32,6 @@
  *-------------------------------------------------------------------------*
  * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#include <Utility/CppMacros.h>
 #include <string.h>
 #include <sys/types.h>
 #ifndef _WIN32
diff --git a/Core/Tools/mangler/wnet/packet.cpp b/Core/Tools/mangler/wnet/packet.cpp
diff --git a/Core/Tools/mangler/wnet/tcp.cpp b/Core/Tools/mangler/wnet/tcp.cpp
diff --git a/Core/Tools/mangler/wnet/udp.cpp b/Core/Tools/mangler/wnet/udp.cpp
diff --git a/Core/Tools/matchbot/generals.cpp b/Core/Tools/matchbot/generals.cpp
diff --git a/Core/Tools/matchbot/global.cpp b/Core/Tools/matchbot/global.cpp
diff --git a/Core/Tools/matchbot/main.cpp b/Core/Tools/matchbot/main.cpp
diff --git a/Core/Tools/matchbot/matcher.cpp b/Core/Tools/matchbot/matcher.cpp
diff --git a/Core/Tools/matchbot/mydebug.cpp b/Core/Tools/matchbot/mydebug.cpp
diff --git a/Core/Tools/matchbot/wlib/configfile.cpp b/Core/Tools/matchbot/wlib/configfile.cpp
diff --git a/Core/Tools/matchbot/wlib/critsec.cpp b/Core/Tools/matchbot/wlib/critsec.cpp
diff --git a/Core/Tools/matchbot/wlib/streamer.cpp b/Core/Tools/matchbot/wlib/streamer.cpp
diff --git a/Core/Tools/matchbot/wlib/threadfac.cpp b/Core/Tools/matchbot/wlib/threadfac.cpp
diff --git a/Core/Tools/matchbot/wlib/wdebug.cpp b/Core/Tools/matchbot/wlib/wdebug.cpp
diff --git a/Core/Tools/matchbot/wlib/wstring.cpp b/Core/Tools/matchbot/wlib/wstring.cpp
diff --git a/Core/Tools/matchbot/wnet/field.cpp b/Core/Tools/matchbot/wnet/field.cpp
diff --git a/Core/Tools/matchbot/wnet/packet.cpp b/Core/Tools/matchbot/wnet/packet.cpp
diff --git a/Core/Tools/matchbot/wnet/tcp.cpp b/Core/Tools/matchbot/wnet/tcp.cpp
diff --git a/Core/Tools/matchbot/wnet/udp.cpp b/Core/Tools/matchbot/wnet/udp.cpp
diff --git a/Core/Tools/textureCompress/textureCompress.cpp b/Core/Tools/textureCompress/textureCompress.cpp
diff --git a/Core/Tools/wolSetup/verchk.cpp b/Core/Tools/wolSetup/verchk.cpp
diff --git a/Core/Tools/wolSetup/wolInit.cpp b/Core/Tools/wolSetup/wolInit.cpp

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`******************************************************************************/`
`36`	`36`
`37`	`37`	`#include "WWCOMUtil.h"`
	`38`	`+#include <Utility/CppMacros.h>`
`38`	`39`
`39`	`40`	`/******************************************************************************`
`40`	`41`	`*`