Skip to content

Commit

Permalink
Revert "Define NOMINMAX when including Windows.h (#81)"
Browse files Browse the repository at this point in the history
This reverts commit c5b46c6.

This is done to be able to merge dev branch into main.
The commit will be restored on top of the dev branch.

Signed-off-by: Martin Olivier <[email protected]>
  • Loading branch information
martin-olivier committed Jan 3, 2025
1 parent c5b46c6 commit ede6f0f
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions include/dylib.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,10 @@
#if (defined(_WIN32) || defined(_WIN64))
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#define DYLIB_UNDEFINE_LEAN_AND_MEAN
#endif
#ifndef NOMINMAX
#define NOMINMAX
#define DYLIB_UNDEFINE_NOMINMAX
#endif
#include <windows.h>
#ifdef DYLIB_UNDEFINE_LEAN_AND_MEAN
#undef WIN32_LEAN_AND_MEAN
#undef DYLIB_UNDEFINE_LEAN_AND_MEAN
#endif
#ifdef DYLIB_UNDEFINE_NOMINMAX
#undef NOMINMAX
#undef DYLIB_UNDEFINE_NOMINMAX
#else
#include <windows.h>
#endif
#else
#include <dlfcn.h>
Expand Down

0 comments on commit ede6f0f

Please sign in to comment.