pgsql: oauth: Rename macro to avoid collisions on Windows

From: Daniel Gustafsson <dgustafsson(at)postgresql(dot)org>
To: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: pgsql: oauth: Rename macro to avoid collisions on Windows
Date: 2025-02-24 21:35:37
Message-ID: E1tmg6z-000Vwl-2F@gemulon.postgresql.org
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-committers

oauth: Rename macro to avoid collisions on Windows

Our json parsing defined the macros OPTIONAL and REQUIRED to decorate the
structs with for increased readability. This however collides with macros
in the <windef.h> header on Windows.

../src/interfaces/libpq/fe-auth-oauth-curl.c:398:9: warning: "OPTIONAL" redefined
398 | #define OPTIONAL false
| ^~~~~~~~
In file included from D:/a/_temp/msys64/ucrt64/include/windef.h:9,
from D:/a/_temp/msys64/ucrt64/include/windows.h:69,
from D:/a/_temp/msys64/ucrt64/include/winsock2.h:23,
from ../src/include/port/win32_port.h:60,
from ../src/include/port.h:24,
from ../src/include/c.h:1331,
from ../src/include/postgres_fe.h:28,
from ../src/interfaces/libpq/fe-auth-oauth-curl.c:16:
include/minwindef.h:65:9: note: this is the location of the previous definition
65 | #define OPTIONAL
| ^~~~~~~~

Rename to avoid compilation errors in anticipation of implementing
support for Windows.

Reported-by: Dave Cramer (on PostgreSQL Hacking Discord)

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/d1146dc2a72e96294045f7feb6d0f29082e1c71c

Modified Files
--------------
src/interfaces/libpq/fe-auth-oauth-curl.c | 34 +++++++++++++++----------------
1 file changed, 17 insertions(+), 17 deletions(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Masahiko Sawada 2025-02-24 22:04:19 pgsql: Fix assertion when decoding XLOG_PARAMETER_CHANGE on promoted pr
Previous Message Melanie Plageman 2025-02-24 21:11:19 pgsql: Add lossy indicator to TBMIterateResult