Mercurial > hg > orthanc-databases
comparison Framework/PostgreSQL/PostgreSQLIncludes.h @ 176:0246923d4df9
trying to fix msvc builds with postgresql
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sat, 12 Dec 2020 17:49:07 +0100 |
parents | 30d3f68631d2 |
children | 02ad3ea95fca |
comparison
equal
deleted
inserted
replaced
175:1b67c6f8037c | 176:0246923d4df9 |
---|---|
26 #include <vector> | 26 #include <vector> |
27 #include <map> | 27 #include <map> |
28 #include <cmath> | 28 #include <cmath> |
29 #include <Enumerations.h> | 29 #include <Enumerations.h> |
30 | 30 |
31 /** | |
32 * This include must be before including "c.h" from PostgreSQL, | |
33 * otherwise the function "static bool | |
34 * boost::date_time::special_values_parser<date_type, | |
35 * charT>::__builtin_expect()" from Boost clashes with macro | |
36 * "__builtin_expect()" used by PostgreSQL 11. | |
37 **/ | |
38 #include <boost/date_time/posix_time/posix_time.hpp> | |
39 #include <boost/system/error_code.hpp> | |
40 | |
41 // PostgreSQL includes | 31 // PostgreSQL includes |
42 #include <pg_config.h> | 32 #include <pg_config.h> |
43 | 33 |
44 #if !defined(PG_VERSION_NUM) | 34 #if !defined(PG_VERSION_NUM) |
45 # error PG_VERSION_NUM is not defined | 35 # error PG_VERSION_NUM is not defined |
46 #endif | 36 #endif |
47 | 37 |
48 #if PG_VERSION_NUM >= 110000 | |
49 # include <postgres.h> | |
50 # undef LOG // This one comes from <postgres.h>, and conflicts with <Logging.h> | |
51 #endif | |
52 | |
53 #include <libpq-fe.h> | 38 #include <libpq-fe.h> |
54 #include <c.h> | 39 #include <catalog/pg_type_d.h> |
55 #include <catalog/pg_type.h> |