Skip to content

[BUILD] Fix MinGW GCC cross compilation build on Linux for Windows #3666

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

Merged
merged 1 commit into from
Sep 28, 2025
Merged

[BUILD] Fix MinGW GCC cross compilation build on Linux for Windows #3666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions api/include/opentelemetry/plugin/detail/dynamic_load_windows.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#include "opentelemetry/plugin/hook.h"
#include "opentelemetry/version.h"

#include <Windows.h>
#include <windows.h>

#include <WinBase.h>
#include <errhandlingapi.h>
#include <winbase.h>

OPENTELEMETRY_BEGIN_NAMESPACE
namespace plugin
Expand Down
2 changes: 1 addition & 1 deletion exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <vector>

#ifdef _WIN32
# include <Windows.h>
# include <windows.h>
#endif

OPENTELEMETRY_BEGIN_NAMESPACE
Expand Down
2 changes: 1 addition & 1 deletion exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include <vector>

#ifdef HAVE_KRABS_TESTS
// krabs.hpp requires this definition of min macro from Windows.h
// krabs.hpp requires this definition of min macro from windows.h
# ifndef min
# define min(a, b) (((a) < (b)) ? (a) : (b))
# endif
Expand Down
2 changes: 1 addition & 1 deletion exporters/etw/include/opentelemetry/exporters/etw/etw_random_id_generator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "opentelemetry/version.h"

#ifdef _WIN32
# include "Windows.h"
# include "windows.h"
#endif

OPENTELEMETRY_BEGIN_NAMESPACE
Expand Down
4 changes: 2 additions & 2 deletions exporters/etw/include/opentelemetry/exporters/etw/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
#include "opentelemetry/version.h"

#ifdef _WIN32
# include <Windows.h>
# include <evntprov.h>
# include <wincrypt.h>
# include <windows.h>
# pragma comment(lib, "Advapi32.lib")
# pragma comment(lib, "Rpcrt4.lib")
# include <Objbase.h>
# include <objbase.h>
# pragma comment(lib, "Ole32.Lib")
#else
# include <codecvt>
Expand Down
2 changes: 1 addition & 1 deletion exporters/etw/include/opentelemetry/exporters/etw/uuid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <vector>

#ifdef _WIN32
# include "Windows.h"
# include "windows.h"
#endif

OPENTELEMETRY_BEGIN_NAMESPACE
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/src/otlp_file_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
# define NOMINMAX
# endif

# include <Windows.h>
# include <direct.h>
# include <io.h>
# include <windows.h>

# ifdef UNICODE
# include <atlconv.h>
Expand Down
2 changes: 1 addition & 1 deletion ext/include/opentelemetry/ext/http/server/socket_tools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#ifdef _WIN32

// # include <Windows.h>
// # include <windows.h>

# include <winsock2.h>

Expand Down
2 changes: 1 addition & 1 deletion sdk/src/common/fast_random_number_generator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace common
*
* ...
* #define NOMINMAX
* #include <Windows.h>
* #include <windows.h>
* ...
*
* See:
Expand Down
Loading