diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2021-10-24 20:45:56 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2021-10-24 20:45:56 +0300 |
| commit | 3bad61e1ac5244efb4fff6062763ea759e0aafec (patch) | |
| tree | bafb349ba79b3eee04f58ef53936a04f0797f803 /nt | |
| parent | beb265450c01b3e3188f844ff0fb961d9df79071 (diff) | |
| download | emacs-3bad61e1ac5244efb4fff6062763ea759e0aafec.tar.gz | |
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.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/Makefile.in | 1 | ||||
| -rw-r--r-- | nt/addpm.c | 2 | ||||
| -rw-r--r-- | nt/cmdproxy.c | 2 | ||||
| -rw-r--r-- | nt/ddeclient.c | 2 | ||||
| -rw-r--r-- | nt/preprep.c | 2 | ||||
| -rw-r--r-- | nt/runemacs.c | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/nt/Makefile.in b/nt/Makefile.in index 3274ff924f9..811680da851 100644 --- 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 f07e4c2c5a6..4fbcf6c05ea 100644 --- 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 2bc03673d5a..f5a0550aa9d 100644 --- 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 1c1f7679ea1..0a44cbfd770 100644 --- 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 48c55ef2218..8b054b19a71 100644 --- 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 cce4904d88d..b4ed9fb1564 100644 --- 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> |