Cleanup, remove old mingw stdio hacks

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-04-22 22:28:16 +02:00
parent 9f3252f7ca
commit 969973e3cd
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
3 changed files with 32 additions and 75 deletions

View file

@ -1,58 +0,0 @@
/*
* DISTRHO Cardinal Plugin
* Copyright (C) 2021 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 3 of
* the License, or any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* For a full copy of the GNU General Public License see the LICENSE file.
*/
#pragma once
/* On mingw stdio functions like printf are not inline, and thus get defined every time they are used.
* Its <cstdio> also does `#undef printf` which invalidates our macros :(
* We go through a few steps to ensure unique symbol names.
*/
#ifdef STDIO_OVERRIDE
// helper macros
# define STDIO_OVERRIDE_HELPER(NS, SEP, FN) NS ## SEP ## FN
# define STDIO_OVERRIDE_MACRO(NS, FN) STDIO_OVERRIDE_HELPER(NS, _, FN)
// step 1: prefix the needed stdio functions
# define printf STDIO_OVERRIDE_MACRO(STDIO_OVERRIDE, printf)
// step 2: inlude <stdio.h> which will use our prefixed names
# include <stdio.h>
// step 3: undef and define dummy functions required for <cstdio> (it uses `using ::printf` syntax)
# undef printf
static inline void printf() {}
// step 4: we can safely include <cstdio> now
# include_next <cstdio>
// step 5: define the same macros as in step 1
# define printf STDIO_OVERRIDE_MACRO(STDIO_OVERRIDE, printf)
// step 6: place the macro prefixed names in std namespace
/*
namespace std {
using ::printf;
}
*/
#else // STDIO_OVERRIDE
// if STDIO_OVERRIDE is not defined, we have nothing to do
# include_next <cstdio>
#endif // STDIO_OVERRIDE

View file

@ -1,6 +1,6 @@
/* /*
* DISTRHO Cardinal Plugin * DISTRHO Cardinal Plugin
* Copyright (C) 2021 Filipe Coelho <falktx@falktx.com> * Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@ -16,20 +16,10 @@
*/ */
#pragma once #pragma once
#include_next <mutex>
/* On mingw stdio functions like printf are not inline, and thus get defined every time they are used. // fix macro pollution from Windows headers
* We go through a few steps to ensure unique symbol names. #undef IN
*/ #undef OUT
#ifdef STDIO_OVERRIDE #undef far
#undef near
// helper macros
# define STDIO_OVERRIDE_HELPER(NS, SEP, FN) NS ## SEP ## FN
# define STDIO_OVERRIDE_MACRO(NS, FN) STDIO_OVERRIDE_HELPER(NS, _, FN)
// prefix the needed stdio functions
# define printf STDIO_OVERRIDE_MACRO(STDIO_OVERRIDE, printf)
#endif // STDIO_OVERRIDE
// now just include the real stdio.h
#include_next <stdio.h>

View file

@ -0,0 +1,25 @@
/*
* DISTRHO Cardinal Plugin
* Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 3 of
* the License, or any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* For a full copy of the GNU General Public License see the LICENSE file.
*/
#pragma once
#include_next <thread>
// fix macro pollution from Windows headers
#undef IN
#undef OUT
#undef far
#undef near