diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2021-02-10 13:32:10 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2021-02-10 13:36:18 +0100 |
| commit | 1f4771cd0d1ff53a5d171606b6659324597d9e14 (patch) | |
| tree | bbc4334f60ac7851d059c10cd7f1e3e84d4ddbcf | |
| parent | ad34b9c278608dfdcfdbe7402acb3a6dd04c3d0e (diff) | |
| download | qpdf-1f4771cd0d1ff53a5d171606b6659324597d9e14.tar.zst | |
Minor clean up of Windows headers
| -rw-r--r-- | examples/pdf-mod-info.cc | 7 | ||||
| -rw-r--r-- | libqpdf/QUtil.cc | 1 | ||||
| -rw-r--r-- | libqpdf/SecureRandomDataProvider.cc | 1 | ||||
| -rw-r--r-- | qpdf/test_unicode_filenames.cc | 7 |
4 files changed, 6 insertions, 10 deletions
diff --git a/examples/pdf-mod-info.cc b/examples/pdf-mod-info.cc index 06fcf17e..03fa2354 100644 --- a/examples/pdf-mod-info.cc +++ b/examples/pdf-mod-info.cc @@ -9,13 +9,6 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> -#ifdef _WIN32 -#include <windows.h> -#include <direct.h> -#include <io.h> -#else -#include <unistd.h> -#endif static char const* version = "1.1"; static char const* whoami = 0; diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc index 4df76fa8..c5dfa74c 100644 --- a/libqpdf/QUtil.cc +++ b/libqpdf/QUtil.cc @@ -28,6 +28,7 @@ # include <cwchar> #endif #ifdef _WIN32 +# define WIN32_LEAN_AND_MEAN # include <windows.h> # include <direct.h> # include <io.h> diff --git a/libqpdf/SecureRandomDataProvider.cc b/libqpdf/SecureRandomDataProvider.cc index 87839dc6..705046c6 100644 --- a/libqpdf/SecureRandomDataProvider.cc +++ b/libqpdf/SecureRandomDataProvider.cc @@ -3,6 +3,7 @@ #include <qpdf/qpdf-config.h> #include <qpdf/QUtil.hh> #ifdef _WIN32 +# define WIN32_LEAN_AND_MEAN # include <windows.h> # include <direct.h> # include <io.h> diff --git a/qpdf/test_unicode_filenames.cc b/qpdf/test_unicode_filenames.cc index 45701a9f..3ef71be5 100644 --- a/qpdf/test_unicode_filenames.cc +++ b/qpdf/test_unicode_filenames.cc @@ -1,7 +1,8 @@ #ifdef _WIN32 -#include <windows.h> -#include <direct.h> -#include <io.h> +# define WIN32_LEAN_AND_MEAN +# include <windows.h> +# include <direct.h> +# include <io.h> #endif #include <iostream> |