summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-18 10:04:20 +0300
committerLionel Elie Mamane <lionel@mamane.lu>2014-09-26 15:37:27 +0200
commitac10225762ce2c242d21126b5730b1d60f0150ed (patch)
tree6b66847a4ff1cfccc4c7656e0509f57da3c3c440 /include
parent4e26b915687acbfab5ebc260d8a7a434761721bd (diff)
implement --with-system-odbc on windows
Change-Id: I1757b9ce74277b1c11533f41caeafaf9b88658ef
Diffstat (limited to 'include')
-rw-r--r--include/connectivity/IParseContext.hxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/connectivity/IParseContext.hxx b/include/connectivity/IParseContext.hxx
index 3b4001b9eb96..a012932a0fab 100644
--- a/include/connectivity/IParseContext.hxx
+++ b/include/connectivity/IParseContext.hxx
@@ -43,11 +43,12 @@ namespace connectivity
ERROR_INVALID_INT_COMPARE, // "The field can not be compared with a number."
ERROR_INVALID_DATE_COMPARE, // "The field can not be compared with a date."
ERROR_INVALID_REAL_COMPARE, // "The field can not be compared with a floating point number."
- ERROR_INVALID_TABLE, // "The database does not contain a table named \"#\"."
+ ERROR_INVALID_TABLE1, // "The database does not contain a table named \"#\"."
+ // Named like this to avoid conflict with a #define in the Windows system ODBC headers.
ERROR_INVALID_TABLE_OR_QUERY, // "The database does contain neither a table nor a query named \"#\"."
ERROR_INVALID_COLUMN, // "The column \"#1\" is unknown in the table \"#2\"."
ERROR_INVALID_TABLE_EXIST, // "The database already contains a table or view with name \"#\"."
- ERROR_INVALID_QUERY_EXIST // "The database already contains a query with name \"#\".";
+ ERROR_INVALID_QUERY_EXIST, // "The database already contains a query with name \"#\".";
};
enum InternationalKeyCode