Fix compilation errors with MinGW64 GCC 11

* lib-src/ntlib.c (IS_DIRECTORY_SEP): Remove redundant macro.

* lib-src/ntlib.c (DEFER_MS_W32_H):
* nt/addpm.c (DEFER_MS_W32_H):
* nt/cmdproxy.c (DEFER_MS_W32_H):
* nt/ddeclient.c (DEFER_MS_W32_H):
* nt/preprep.c (DEFER_MS_W32_H):
* nt/runemacs.c (DEFER_MS_W32_H): Fix a typo.
* nt/Makefile.in (BASE_CFLAGS): Add -I switches to pick up
config.h and lib/attribute.h.

diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index f1c68cb1b2acd5af7a0ab1f4b78e000665f80088..c8bcf742fea827c02d5a29c10b86df5af1372e9a 100644 (file)
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -20,7 +20,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
-#define DEFER_MS_W3_H
+#define DEFER_MS_W32_H
 #include <config.h>
 
 #include <windows.h>
@@ -290,9 +290,6 @@ is_exec (const char * name)
         stricmp (p, ".cmd") == 0));
 }
 
-/* FIXME?  This is in configure.ac now - is this still needed?  */
-#define IS_DIRECTORY_SEP(x) ((x) == '/' || (x) == '\\')
-
 /* We need stat/fsfat below because nt/inc/sys/stat.h defines struct
    stat that is incompatible with the MS run-time libraries.  */
 int

diff --git a/nt/Makefile.in b/nt/Makefile.in
index 3274ff924f961d58e559e3c628eb92f637e4c38a..811680da8511373a846a25f230e6e84ff532f19f 100644 (file)
--- a/nt/Makefile.in
+++ b/nt/Makefile.in
@@ -144,6 +144,7 @@ LIBS_ADDPM = -lole32 -luuid
 ## Compilation and linking flags
 BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
              $(WARN_CFLAGS) $(WERROR_CFLAGS) \
+             -I../src -I${srcdir}/../src -I../lib -I${srcdir}/../lib \
              -I. -I${srcdir}
 
 ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}

diff --git a/nt/addpm.c b/nt/addpm.c
index f07e4c2c5a60817e9a22b2cc9b8da0d49c14dac8..4fbcf6c05ea7d80b3cc05d1058ee78ebc85cbcaa 100644 (file)
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -35,7 +35,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
    progman way will be used instead, but that is prone to lockups
    caused by other applications not servicing their message queues.  */
 
-#define DEFER_MS_W3_H
+#define DEFER_MS_W32_H
 #include <config.h>
 
 #include <stdlib.h>

diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 2bc03673d5a9ce95cb3e597a34b2cd4ed6a5e594..f5a0550aa9d2602dbcf677970d87d42e1646adc3 100644 (file)
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -27,7 +27,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
-#define DEFER_MS_W3_H
+#define DEFER_MS_W32_H
 #include <config.h>
 
 #include <windows.h>

diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index 1c1f7679ea19d0d5e9165963bdcf158daf44de2b..0a44cbfd7709d16995dea11660cdf3f294731867 100644 (file)
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
-#define DEFER_MS_W3_H
+#define DEFER_MS_W32_H
 #include <config.h>
 
 #include <windows.h>

diff --git a/nt/preprep.c b/nt/preprep.c
index 48c55ef2218f5b2d84c92bba654171a33c82cafd..8b054b19a71afec266166032cc063f3efeb7098c 100644 (file)
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -21,7 +21,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
      based on code from addsection.c
 */
 
-#define DEFER_MS_W3_H
+#define DEFER_MS_W32_H
 #include <config.h>
 
 #include <stdlib.h>

diff --git a/nt/runemacs.c b/nt/runemacs.c
index cce4904d88d8c2be966f3ffa44ac464d7464f747..b4ed9fb1564ccb5540576ba8418c32deed297919 100644 (file)
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -40,7 +40,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* #define CHOOSE_NEWEST_EXE */
 
-#define DEFER_MS_W3_H
+#define DEFER_MS_W32_H
 #include <config.h>
 
 #include <windows.h>