diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-05-23 15:04:17 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-06-08 01:18:04 +0200 |
| commit | 1dfa922606e497918e57a6a06f96ee63b7fb163e (patch) | |
| tree | 37058b862a9ba496f3330aba57183123ba132ea2 /src/plugins/sqldrivers/oci/qsql_oci.cpp | |
| parent | 076b4bed9f418f97f9fb29fce4f948f0d98854c1 (diff) | |
Remove the manual undef of the min/max macros, or def NOMINMAX
We now add NOMINMAX to PlatformCommonInternal target which will be
linked to everything else, so min/max will not be defined upon the
inclusion of `windows.h`, or other headers.
Pick-to: 6.5 6.6
Change-Id: I10016720dac7ce015e929885b7368ee86d8b6918
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/sqldrivers/oci/qsql_oci.cpp')
| -rw-r--r-- | src/plugins/sqldrivers/oci/qsql_oci.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/plugins/sqldrivers/oci/qsql_oci.cpp b/src/plugins/sqldrivers/oci/qsql_oci.cpp index b670efc15b..1a9eb041b3 100644 --- a/src/plugins/sqldrivers/oci/qsql_oci.cpp +++ b/src/plugins/sqldrivers/oci/qsql_oci.cpp @@ -30,14 +30,7 @@ #define _int64 __int64 #endif - #include <oci.h> -#ifdef max -#undef max -#endif -#ifdef min -#undef min -#endif #include <stdlib.h> |