Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: GitHub noreply@github.com Date: Sun, 09 Jun 2024 11:30:03 UTC Commit: b17d6b2baea9691a610a927ef7a038c035a82df6 https://github.com/geany/geany/commit/b17d6b2baea9691a610a927ef7a038c035a82d...

Log Message: ----------- Merge pull request #3878 from eht16/issue3660_rename_win32_macro

Remove custom WIN32 compiler macro in favor of _WIN32

Modified Paths: -------------- ctags/gnu_regex/regex_internal.h m4/geany-mingw.m4

Modified: ctags/gnu_regex/regex_internal.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -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>

Modified: m4/geany-mingw.m4 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -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)

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).