headers/wincon: Don't define `LF_FACESIZE` when `NOGDI` is in effect

Defining it prevents other definitions such as `LOGFONT{A,W}` and causes
errors:

  $ echo '#include <shobjidl.h>' | gcc -xc -c -DNOGDI -
  In file included from <stdin>:1:
  C:/msys32/mingw32/i686-w64-mingw32/include/shobjidl.h:7170:15: error:
  unknown type name 'LOGFONTW'
   7170 |         const LOGFONTW *plf);
        |               ^~~~~~~~
  C:/msys32/mingw32/i686-w64-mingw32/include/shobjidl.h:7324:15: error:
  unknown type name 'LOGFONTW'
   7324 |         const LOGFONTW *plf,
        |               ^~~~~~~~
  C:/msys32/mingw32/i686-w64-mingw32/include/shobjidl.h:7329:9: error:
  unknown type name 'LOGFONTW'; did you mean 'LPFONT'?
   7329 |         LOGFONTW *plf);
        |         ^~~~~~~~
        |         LPFONT

Reference: https://sourceforge.net/p/mingw-w64/mailman/message/37288840/
Reported-by: Orgad Shaneh <orgads@gmail.com>
Signed-off-by: Liu Hao <lh_mouse@126.com>
diff --git a/mingw-w64-headers/include/wincon.h b/mingw-w64-headers/include/wincon.h
index 56ea29b..d4dea61 100644
--- a/mingw-w64-headers/include/wincon.h
+++ b/mingw-w64-headers/include/wincon.h
@@ -314,9 +314,7 @@
 WINBASEAPI DWORD WINAPI GetConsoleCommandHistoryW(LPWSTR Commands, DWORD CommandBufferLength, LPWSTR ExeName);
 #define GetConsoleCommandHistory __MINGW_NAME_AW(GetConsoleCommandHistory)
 
-#ifndef LF_FACESIZE
-#define LF_FACESIZE 32
-#endif
+#ifndef NOGDI
 
 typedef struct _CONSOLE_FONT_INFOEX {
   ULONG cbSize;
@@ -327,6 +325,20 @@
   WCHAR FaceName[LF_FACESIZE];
 } CONSOLE_FONT_INFOEX, *PCONSOLE_FONT_INFOEX;
 
+WINBASEAPI WINBOOL WINAPI GetCurrentConsoleFontEx(
+  HANDLE hConsoleOutput,
+  WINBOOL bMaximumWindow,
+  PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx
+);
+
+WINBASEAPI WINBOOL WINAPI SetCurrentConsoleFontEx(
+  HANDLE hConsoleOutput,
+  WINBOOL bMaximumWindow,
+  PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx
+);
+
+#endif  /* NOGDI */
+
 #define HISTORY_NO_DUP_FLAG 0x1
 
 typedef struct _CONSOLE_HISTORY_INFO {
@@ -378,12 +390,6 @@
   PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx
 );
 
-WINBASEAPI WINBOOL WINAPI GetCurrentConsoleFontEx(
-  HANDLE hConsoleOutput,
-  WINBOOL bMaximumWindow,
-  PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx
-);
-
 WINBASEAPI WINBOOL WINAPI SetConsoleHistoryInfo(
   PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo
 );
@@ -393,12 +399,6 @@
   PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx
 );
 
-WINBASEAPI WINBOOL WINAPI SetCurrentConsoleFontEx(
-  HANDLE hConsoleOutput,
-  WINBOOL bMaximumWindow,
-  PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx
-);
-
 #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */
 
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)