aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2007-12-01 05:20:45 +0000
committerAlexey Shchepin <alexey@process-one.net>2007-12-01 05:20:45 +0000
commit9b2e6bcaefe0163eb8ff8eaf5701caedff766529 (patch)
tree6b8aa230032b67b2bb55e87bced5a82f5e9a03d9
parent* src/mod_caps.erl: CAPS support (thanks to Magnus Henoch) (diff)
* src/odbc/odbc_queries.erl: Reverted the previous patch because
it produces "redefining macro 'generic'" compilation error SVN Revision: 1005
-rw-r--r--ChangeLog3
-rw-r--r--src/odbc/odbc_queries.erl6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ec0a32436..62296c055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2007-12-01 Alexey Shchepin <alexey@process-one.net>
+ * src/odbc/odbc_queries.erl: Reverted the previous patch because
+ it produces "redefining macro 'generic'" compilation error
+
* src/mod_caps.erl: CAPS support (thanks to Magnus Henoch)
* src/ejabberd_local.erl: Support for IQ responses
* src/jlib.erl: Added iq_query_or_response_info/1 function
diff --git a/src/odbc/odbc_queries.erl b/src/odbc/odbc_queries.erl
index 7748ed21e..33717c59b 100644
--- a/src/odbc/odbc_queries.erl
+++ b/src/odbc/odbc_queries.erl
@@ -44,9 +44,9 @@
%% We have only two compile time options for db queries:
%-define(generic, true).
%-define(mssql, true).
--ifndef(mssql).
--define(generic, true).
--endif.
+%-ifndef(mssql).
+%-define(generic, true).
+%-endif.
%% -----------------
%% Generic queries