My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions

Issue 171 attachment: build_tdm64-gcc.patch (1.7 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
src/pyodbc.h | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/pyodbc.h b/src/pyodbc.h
index b7ab4a6..c6ff1a9 100644
--- a/src/pyodbc.h
+++ b/src/pyodbc.h
@@ -1,10 +1,9 @@
-
/*
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
* OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
@@ -33,6 +32,11 @@ typedef unsigned long long UINT64;
#else
inline int max(int lhs, int rhs) { return (rhs > lhs) ? rhs : lhs; }
#endif
+
+#ifdef __MINGW64__
+ #include <windows.h>
+#endif
+
#endif

#ifdef __SUN__
@@ -118,6 +122,10 @@ inline void _strlwr(char* name)
}
#else
#define CDECL
+#ifdef __MINGW64__
+ #define min(X,Y) ((X) < (Y) ? (X) : (Y))
+ #define max(X,Y) ((X) > (Y) ? (X) : (Y))
+#endif
#endif

#define STRINGIFY(x) #x
@@ -147,7 +155,7 @@ inline void _strlwr(char* name)

#ifdef PYODBC_TRACE
void CDECL DebugTrace(const char* szFmt, ...);
-#else
+#else
inline void DebugTrace(const char* szFmt, ...) { UNUSED(szFmt); }
#endif
#define TRACE DebugTrace
Powered by Google Project Hosting