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.

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

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}

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>

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>

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>

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>

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>