Skip to content

Fix MSVC build problems caused by 'windows.h' #289

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.

Sign up for GitHub

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

Open
WagnerChristoph wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix MSVC build problems caused by 'windows.h' #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a95338
define 'NOMINMAX' whenever 'windows.h' is included
Jan 30, 2026
9730045
cleanup & remove now obsolete undefs
Jan 30, 2026
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
4 changes: 0 additions & 4 deletions elf/elf_file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@

#include "portable_endian.h"

// tsk namespace is polluted on windows
#ifdef _WIN32
#undef min
#undef max

#define _CRT_SECURE_NO_WARNINGS
#endif

Expand Down
2 changes: 1 addition & 1 deletion elf/portable_endian.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#endif

#elif defined(__WINDOWS__)

# define NOMINMAX
# include <winsock2.h>
# ifdef __GNUC__
# include <sys/param.h>
Expand Down
14 changes: 0 additions & 14 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,6 @@ static __forceinline int __builtin_ctz(unsigned x) {
}
#endif

// tsk namespace is polluted on windows
#ifdef _WIN32
#undef min
#undef max

#define _CRT_SECURE_NO_WARNINGS
#endif

#define MAX_REBOOT_TRIES 5

Expand Down Expand Up @@ -8601,13 +8594,6 @@ bool reboot_command::execute(device_map &devices) {
#include <sys/ioctl.h>
#endif

// tsk namespace is polluted on windows
#ifdef _WIN32
#undef min
#undef max

#define _CRT_SECURE_NO_WARNINGS
#endif

static void sleep_ms(int ms) {
#if defined(__unix__) || defined(__APPLE__)
Expand Down
3 changes: 3 additions & 0 deletions picoboot_connection/picoboot_connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@

#include <assert.h>
#if HAS_LIBUSB
#ifdef _WIN32
#define NOMINMAX
#endif
#include <libusb.h>
#endif
#include "boot/picoboot.h"
Expand Down
3 changes: 0 additions & 3 deletions picoboot_connection/picoboot_connection_cxx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
#include "picoboot_connection_cxx.h"

#ifdef _WIN32
#undef min
#undef max

#define _CRT_SECURE_NO_WARNINGS
#endif

Expand Down
Loading