Mercurial > mxe-octave

view src/gdal-2-ucrt.patch @ 5962:88dfa92d0c86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add patches for building packages with UCRT. * src/flac-1-ucrt.patch, src/gdal-2-ucrt.patch, src/mesa-2-ucrt.patch: Don't set specific msvcrt version. * src/flac.mk: autoreconf after applying patch. * dist-files.mk: Add new files to build system.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 18 Nov 2021 14:59:34 +0100
parents
children
line wrap: on
line source

From bd4d925741b6c06ba38888a9bb959b490adf27af Mon Sep 17 00:00:00 2001
From: Jeremy Drake <github@jdrake.com>
Date: Mon, 18 Oct 2021 11:02:08 -0700
Subject: [PATCH] gdal: don't define __MSVCRT_VERSION__

--- gdal-3.3.2/port/cpl_port.h.orig	2021-10-18 10:57:01.393925700 -0700
+++ gdal-3.3.2/port/cpl_port.h	2021-10-18 10:57:27.784506600 -0700
@@ -113,15 +113,6 @@
 /*      MinGW stuff                                                     */
 /* ==================================================================== */
 
-/* We need __MSVCRT_VERSION__ >= 0x0700 to have "_aligned_malloc" */
-/* Latest versions of mingw32 define it, but with older ones, */
-/* we need to define it manually */
-#if defined(__MINGW32__)
-#ifndef __MSVCRT_VERSION__
-#define __MSVCRT_VERSION__ 0x0700
-#endif
-#endif
-
 /* Needed for std=c11 on Solaris to have strcasecmp() */
 #if defined(GDAL_COMPILATION) && defined(__sun__) && (__STDC_VERSION__ + 0) >= 201112L && (_XOPEN_SOURCE + 0) < 600
 #ifdef _XOPEN_SOURCE