From b05d459dfa2b65fe61da339a933441cde588c65a Mon Sep 17 00:00:00 2001 From: conrad Date: Sun, 1 Jan 2023 16:10:45 +1000 Subject: [PATCH] rearrange --- include/armadillo_bits/compiler_setup.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/armadillo_bits/compiler_setup.hpp b/include/armadillo_bits/compiler_setup.hpp index ead6d564..531ea0aa 100644 --- a/include/armadillo_bits/compiler_setup.hpp +++ b/include/armadillo_bits/compiler_setup.hpp @@ -429,13 +429,13 @@ #pragma message ("WARNING: undefined conflicting 'check' macro") #endif -// https://sourceware.org/bugzilla/show_bug.cgi?id=19239 -#undef minor -#undef major - #if defined(min) || defined(max) #undef min #undef max #pragma message ("WARNING: undefined conflicting 'min' and/or 'max' macros;") #pragma message ("WARNING: suggest to define NOMINMAX before including any windows header") #endif + +// https://sourceware.org/bugzilla/show_bug.cgi?id=19239 +#undef minor +#undef major