[NSIS-commits] SF.net SVN: nsis:[7389] NSIS/trunk

[<and...@us...>]

Revision: 7389
          http://sourceforge.net/p/nsis/code/7389
Author:   anders_k
Date:     2023-05-21 16:27:44 +0000 (Sun, 21 May 2023)
Log Message:
-----------
Fixed mingw-w64 12 warnings (patch #310)

Modified Paths:
--------------
    NSIS/trunk/Contrib/Makensisw/utils.h
    NSIS/trunk/Docs/src/history.but
    NSIS/trunk/Source/exehead/exec.c

Modified: NSIS/trunk/Contrib/Makensisw/utils.h
===================================================================
--- NSIS/trunk/Contrib/Makensisw/utils.h	2023-05-21 16:15:16 UTC (rev 7388)
+++ NSIS/trunk/Contrib/Makensisw/utils.h	2023-05-21 16:27:44 UTC (rev 7389)
@@ -84,8 +84,8 @@
 void SetDialogFocus(HWND hDlg, HWND hCtl); // Use this and not SetFocus()!
 #define DlgRet(hDlg, val) ( SetWindowLongPtr((hDlg), DWLP_MSGRESULT, (val)) | TRUE )
 HWND GetComboEdit(HWND hCB);
-#define DisableItems(hwnd) EnableDisableItems(((hwnd), 0))
-#define EnableItems(hwnd) EnableDisableItems(((hwnd), 1))
+#define DisableItems(hwnd) EnableDisableItems(((void)(hwnd), 0))
+#define EnableItems(hwnd) EnableDisableItems(((void)(hwnd), 1))
 void EnableDisableItems(int on);
 bool OpenRegSettingsKey(HKEY &hKey, bool create = false);
 #define CreateRegSettingsKey(refhkey) OpenRegSettingsKey((refhkey), true)

Modified: NSIS/trunk/Docs/src/history.but
===================================================================
--- NSIS/trunk/Docs/src/history.but	2023-05-21 16:15:16 UTC (rev 7388)
+++ NSIS/trunk/Docs/src/history.but	2023-05-21 16:27:44 UTC (rev 7389)
@@ -40,7 +40,7 @@
 
 \b Fixed halibut \#{fprintf format security}compiler warnings (\W{http://sf.net/p/nsis/patches/304}{patch #304})
 
-\b Fixed various issues with very old and new GCC versions (\W{http://sf.net/p/nsis/bugs/1275}{bug #1275}, \W{http://sf.net/p/nsis/patches/307}{patch #307})
+\b Fixed various issues with very old and new GCC versions (\W{http://sf.net/p/nsis/bugs/1275}{bug #1275}, \W{http://sf.net/p/nsis/patches/307}{patch #307}, \W{http://sf.net/p/nsis/patches/310}{patch #310})
 
 \b Disable stub relocations in newer GCC (\W{http://sf.net/p/nsis/bugs/1283}{bug #1283})
 

Modified: NSIS/trunk/Source/exehead/exec.c
===================================================================
--- NSIS/trunk/Source/exehead/exec.c	2023-05-21 16:15:16 UTC (rev 7388)
+++ NSIS/trunk/Source/exehead/exec.c	2023-05-21 16:27:44 UTC (rev 7389)
@@ -271,7 +271,14 @@
   //var4 = g_usrvars[parm4];
   //var5 = g_usrvars[parm5];
 
+#if __GNUC__ >= 12
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdangling-pointer"
+#endif
   g_parms = lent.offsets;
+#if __GNUC__ >= 12
+#pragma GCC diagnostic pop
+#endif
 
   switch (which)
   {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.