Skip to content

Commit 000cdf2

Browse files
committed
RFR: use winproof88.h instead of windows.h
1 parent 3085185 commit 000cdf2

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

CConsole/src/CConsole.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,11 @@
2222
#include <string>
2323
#include <thread> // requires cpp11
2424

25-
#include <winsock.h> // for gethostname()
26-
2725
#include "../../../PFL/PFL/PFL.h"
28-
2926
// WINAPI header include just for the FOREGROUND_XXX and WORD macros and console API functions
30-
#ifndef WIN32_LEAN_AND_MEAN
31-
#define WIN32_LEAN_AND_MEAN
32-
#endif
33-
#include <windows.h>
27+
#include "../../../PFL/PFL/winproof88.h"
28+
29+
#include <winsock.h> // for gethostname()
3430

3531
// unused warnings
3632
// todo: revise these warnings when C++11 compiler is set, so that std::iota, etc can be used instead of itoa

CConsole/src/CConsole.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
###################################################################################
1010
*/
1111

12-
13-
1412
// copied NULL from stdlib.h to avoid including big ass headers
1513
/* Define NULL pointer value */
1614
#ifndef NULL
@@ -21,7 +19,6 @@
2119
#endif
2220
#endif
2321

24-
2522
// copied WORD and DWORD from minwindef.h to avoid including big ass headers
2623
#ifndef _MINWINDEF_
2724
typedef unsigned long DWORD;

CConsole/src/conmain.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,9 @@
1616
#include <mutex> // requires cpp11
1717
#include <thread> // requires cpp11
1818

19-
#ifndef WIN32_LEAN_AND_MEAN
20-
#define WIN32_LEAN_AND_MEAN
21-
#endif
22-
#include <windows.h>
23-
19+
#include "../../../PFL/PFL/winproof88.h"
2420
#include "../../../PFL/PFL/PFL.h"
2521

26-
2722
#define CON_TITLE "CConsole demo program"
2823

2924

0 commit comments

Comments
 (0)