Commit 1f4771cd0d1ff53a5d171606b6659324597d9e14

Authored by Jay Berkenbilt
1 parent ad34b9c2

Minor clean up of Windows headers

examples/pdf-mod-info.cc
@@ -9,13 +9,6 @@ @@ -9,13 +9,6 @@
9 #include <string.h> 9 #include <string.h>
10 #include <stdlib.h> 10 #include <stdlib.h>
11 #include <stdio.h> 11 #include <stdio.h>
12 -#ifdef _WIN32  
13 -#include <windows.h>  
14 -#include <direct.h>  
15 -#include <io.h>  
16 -#else  
17 -#include <unistd.h>  
18 -#endif  
19 12
20 static char const* version = "1.1"; 13 static char const* version = "1.1";
21 static char const* whoami = 0; 14 static char const* whoami = 0;
libqpdf/QUtil.cc
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 # include <cwchar> 28 # include <cwchar>
29 #endif 29 #endif
30 #ifdef _WIN32 30 #ifdef _WIN32
  31 +# define WIN32_LEAN_AND_MEAN
31 # include <windows.h> 32 # include <windows.h>
32 # include <direct.h> 33 # include <direct.h>
33 # include <io.h> 34 # include <io.h>
libqpdf/SecureRandomDataProvider.cc
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 #include <qpdf/qpdf-config.h> 3 #include <qpdf/qpdf-config.h>
4 #include <qpdf/QUtil.hh> 4 #include <qpdf/QUtil.hh>
5 #ifdef _WIN32 5 #ifdef _WIN32
  6 +# define WIN32_LEAN_AND_MEAN
6 # include <windows.h> 7 # include <windows.h>
7 # include <direct.h> 8 # include <direct.h>
8 # include <io.h> 9 # include <io.h>
qpdf/test_unicode_filenames.cc
1 #ifdef _WIN32 1 #ifdef _WIN32
2 -#include <windows.h>  
3 -#include <direct.h>  
4 -#include <io.h> 2 +# define WIN32_LEAN_AND_MEAN
  3 +# include <windows.h>
  4 +# include <direct.h>
  5 +# include <io.h>
5 #endif 6 #endif
6 7
7 #include <iostream> 8 #include <iostream>