--- mstools/h/wincon.h	2018/08/09 18:21:12	1.1.1.3
+++ mstools/h/wincon.h	2018/08/09 18:23:07	1.1.1.4
@@ -22,6 +22,10 @@ Revision History:
 #ifndef _WINCON_
 #define _WINCON_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct _COORD {
     SHORT X;
     SHORT Y;
@@ -208,9 +212,9 @@ PeekConsoleInputW(
     LPDWORD lpNumberOfEventsRead
     );
 #ifdef UNICODE
-#define PeekConsoleInput PeekConsoleInputW
+#define PeekConsoleInput  PeekConsoleInputW
 #else
-#define PeekConsoleInput PeekConsoleInputA
+#define PeekConsoleInput  PeekConsoleInputA
 #endif // !UNICODE
 
 BOOL
@@ -230,9 +234,9 @@ ReadConsoleInputW(
     LPDWORD lpNumberOfEventsRead
     );
 #ifdef UNICODE
-#define ReadConsoleInput ReadConsoleInputW
+#define ReadConsoleInput  ReadConsoleInputW
 #else
-#define ReadConsoleInput ReadConsoleInputA
+#define ReadConsoleInput  ReadConsoleInputA
 #endif // !UNICODE
 
 BOOL
@@ -252,9 +256,9 @@ WriteConsoleInputW(
     LPDWORD lpNumberOfEventsWritten
     );
 #ifdef UNICODE
-#define WriteConsoleInput WriteConsoleInputW
+#define WriteConsoleInput  WriteConsoleInputW
 #else
-#define WriteConsoleInput WriteConsoleInputA
+#define WriteConsoleInput  WriteConsoleInputA
 #endif // !UNICODE
 
 BOOL
@@ -276,9 +280,9 @@ ReadConsoleOutputW(
     PSMALL_RECT lpReadRegion
     );
 #ifdef UNICODE
-#define ReadConsoleOutput ReadConsoleOutputW
+#define ReadConsoleOutput  ReadConsoleOutputW
 #else
-#define ReadConsoleOutput ReadConsoleOutputA
+#define ReadConsoleOutput  ReadConsoleOutputA
 #endif // !UNICODE
 
 BOOL
@@ -300,9 +304,9 @@ WriteConsoleOutputW(
     PSMALL_RECT lpWriteRegion
     );
 #ifdef UNICODE
-#define WriteConsoleOutput WriteConsoleOutputW
+#define WriteConsoleOutput  WriteConsoleOutputW
 #else
-#define WriteConsoleOutput WriteConsoleOutputA
+#define WriteConsoleOutput  WriteConsoleOutputA
 #endif // !UNICODE
 
 BOOL
@@ -324,9 +328,9 @@ ReadConsoleOutputCharacterW(
     LPDWORD lpNumberOfCharsRead
     );
 #ifdef UNICODE
-#define ReadConsoleOutputCharacter ReadConsoleOutputCharacterW
+#define ReadConsoleOutputCharacter  ReadConsoleOutputCharacterW
 #else
-#define ReadConsoleOutputCharacter ReadConsoleOutputCharacterA
+#define ReadConsoleOutputCharacter  ReadConsoleOutputCharacterA
 #endif // !UNICODE
 
 BOOL
@@ -358,9 +362,9 @@ WriteConsoleOutputCharacterW(
     LPDWORD lpNumberOfCharsWritten
     );
 #ifdef UNICODE
-#define WriteConsoleOutputCharacter WriteConsoleOutputCharacterW
+#define WriteConsoleOutputCharacter  WriteConsoleOutputCharacterW
 #else
-#define WriteConsoleOutputCharacter WriteConsoleOutputCharacterA
+#define WriteConsoleOutputCharacter  WriteConsoleOutputCharacterA
 #endif // !UNICODE
 
 BOOL
@@ -392,9 +396,9 @@ FillConsoleOutputCharacterW(
     LPDWORD lpNumberOfCharsWritten
     );
 #ifdef UNICODE
-#define FillConsoleOutputCharacter FillConsoleOutputCharacterW
+#define FillConsoleOutputCharacter  FillConsoleOutputCharacterW
 #else
-#define FillConsoleOutputCharacter FillConsoleOutputCharacterA
+#define FillConsoleOutputCharacter  FillConsoleOutputCharacterA
 #endif // !UNICODE
 
 BOOL
@@ -506,9 +510,9 @@ ScrollConsoleScreenBufferW(
     PCHAR_INFO lpFill
     );
 #ifdef UNICODE
-#define ScrollConsoleScreenBuffer ScrollConsoleScreenBufferW
+#define ScrollConsoleScreenBuffer  ScrollConsoleScreenBufferW
 #else
-#define ScrollConsoleScreenBuffer ScrollConsoleScreenBufferA
+#define ScrollConsoleScreenBuffer  ScrollConsoleScreenBufferA
 #endif // !UNICODE
 
 BOOL
@@ -562,9 +566,9 @@ GetConsoleTitleW(
     DWORD nSize
     );
 #ifdef UNICODE
-#define GetConsoleTitle GetConsoleTitleW
+#define GetConsoleTitle  GetConsoleTitleW
 #else
-#define GetConsoleTitle GetConsoleTitleA
+#define GetConsoleTitle  GetConsoleTitleA
 #endif // !UNICODE
 
 BOOL
@@ -578,9 +582,9 @@ SetConsoleTitleW(
     LPWSTR lpConsoleTitle
     );
 #ifdef UNICODE
-#define SetConsoleTitle SetConsoleTitleW
+#define SetConsoleTitle  SetConsoleTitleW
 #else
-#define SetConsoleTitle SetConsoleTitleA
+#define SetConsoleTitle  SetConsoleTitleA
 #endif // !UNICODE
 
 BOOL
@@ -602,9 +606,9 @@ ReadConsoleW(
     LPVOID lpReserved
     );
 #ifdef UNICODE
-#define ReadConsole ReadConsoleW
+#define ReadConsole  ReadConsoleW
 #else
-#define ReadConsole ReadConsoleA
+#define ReadConsole  ReadConsoleA
 #endif // !UNICODE
 
 BOOL
@@ -626,9 +630,9 @@ WriteConsoleW(
     LPVOID lpReserved
     );
 #ifdef UNICODE
-#define WriteConsole WriteConsoleW
+#define WriteConsole  WriteConsoleW
 #else
-#define WriteConsole WriteConsoleA
+#define WriteConsole  WriteConsoleA
 #endif // !UNICODE
 
 #define CONSOLE_TEXTMODE_BUFFER  1
@@ -663,4 +667,8 @@ SetConsoleOutputCP(
     UINT wCodePageID
     );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // _WINCON_