Merge pull request geany#3878 from eht16/issue3660_rename_win32_macro

Remove custom WIN32 compiler macro in favor of _WIN32
peter-scholtens · Jun 9, 2024 · b17d6b2 · b17d6b2
2 parents 1ec7953 + 17f87f8
commit b17d6b2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/ctags/gnu_regex/regex_internal.h b/ctags/gnu_regex/regex_internal.h
@@ -418,7 +418,7 @@ static unsigned int re_string_context_at (const re_string_t *input, int idx,
 #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
 #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
 
-#ifdef WIN32
+#ifdef _WIN32
 # include <malloc.h>
 #else
 # include <alloca.h>

diff --git a/m4/geany-mingw.m4 b/m4/geany-mingw.m4
@@ -6,7 +6,6 @@ AC_DEFUN([GEANY_CHECK_MINGW],
 [
 	case "${host}" in
 		*mingw*)
-			AC_DEFINE([WIN32], [1], [we are cross compiling for WIN32])
 			GEANY_CHECK_VTE([no])
 			GEANY_CHECK_SOCKET([yes])
 			AM_CONDITIONAL([MINGW], true)