Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix windows.h include #832

Merged
merged 4 commits into from
Jan 21, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix ordering of windows includes
  • Loading branch information
phlptp committed Jan 13, 2023
commit a88dd9bb208c2e7cae368f1dd3d0d060b783dfb4
2 changes: 1 addition & 1 deletion examples/simple.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ int main(int argc, char **argv) {
double value{0.0}; // = 3.14;
app.add_option("-d,--double", value, "Some Value");

CLI11_PARSE(app, argc, argv)
CLI11_PARSE(app, argc, argv);

std::cout << "Working on file: " << file << ", direct count: " << app.count("--file")
<< ", opt count: " << opt->count() << std::endl;
Expand Down
10 changes: 6 additions & 4 deletions include/CLI/impl/Argv_inl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@
#endif
#endif
#define NOMINMAX
#include <errhandlingapi.h>
#include <processenv.h>
//first
#include <windef.h>
//second
#include <winbase.h>
//third
#include <processthreadsapi.h>
#include <shellapi.h>
#include <winbase.h>
#include <windef.h>

#undef NOMINMAX
#elif defined(__APPLE__)
#include <crt_externs.h>
Expand Down