diff options
| author | Eli Zaretskii | 2021-10-24 20:45:56 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2021-10-24 20:45:56 +0300 |
| commit | 3bad61e1ac5244efb4fff6062763ea759e0aafec (patch) | |
| tree | bafb349ba79b3eee04f58ef53936a04f0797f803 /lib-src | |
| parent | beb265450c01b3e3188f844ff0fb961d9df79071 (diff) | |
| download | emacs-3bad61e1ac5244efb4fff6062763ea759e0aafec.tar.gz emacs-3bad61e1ac5244efb4fff6062763ea759e0aafec.zip | |
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 'lib-src')
| -rw-r--r-- | lib-src/ntlib.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c index f1c68cb1b2a..c8bcf742fea 100644 --- a/lib-src/ntlib.c +++ b/lib-src/ntlib.c | |||
| @@ -20,7 +20,7 @@ GNU General Public License for more details. | |||
| 20 | You should have received a copy of the GNU General Public License | 20 | You should have received a copy of the GNU General Public License |
| 21 | along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | 21 | along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ |
| 22 | 22 | ||
| 23 | #define DEFER_MS_W3_H | 23 | #define DEFER_MS_W32_H |
| 24 | #include <config.h> | 24 | #include <config.h> |
| 25 | 25 | ||
| 26 | #include <windows.h> | 26 | #include <windows.h> |
| @@ -290,9 +290,6 @@ is_exec (const char * name) | |||
| 290 | stricmp (p, ".cmd") == 0)); | 290 | stricmp (p, ".cmd") == 0)); |
| 291 | } | 291 | } |
| 292 | 292 | ||
| 293 | /* FIXME? This is in configure.ac now - is this still needed? */ | ||
| 294 | #define IS_DIRECTORY_SEP(x) ((x) == '/' || (x) == '\\') | ||
| 295 | |||
| 296 | /* We need stat/fsfat below because nt/inc/sys/stat.h defines struct | 293 | /* We need stat/fsfat below because nt/inc/sys/stat.h defines struct |
| 297 | stat that is incompatible with the MS run-time libraries. */ | 294 | stat that is incompatible with the MS run-time libraries. */ |
| 298 | int | 295 | int |