Date: Wednesday, April 4, 2007 @ 17:09:37
Author: marc
Path: /cvsroot/carob/libmysequoia/src
Modified: CarobMySQL.cpp (1.104 -> 1.105) MySQLAPI.cpp (1.72 -> 1.73)
Now including config.h after log4cxx, to be sure to have the last word
LMS-40. Including our own headers with "" instead of <>
----------------+
CarobMySQL.cpp | 14 +++++++-------
MySQLAPI.cpp | 10 +++++-----
2 files changed, 12 insertions(+), 12 deletions(-)
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.104
libmysequoia/src/CarobMySQL.cpp:1.105
--- libmysequoia/src/CarobMySQL.cpp:1.104 Wed Apr 4 16:32:32 2007
+++ libmysequoia/src/CarobMySQL.cpp Wed Apr 4 17:09:37 2007
@@ -19,13 +19,11 @@
* Contributor(s):
*/
-#include <config.h>
-
-#include <CarobMySQL.hpp>
-#include <CarobStmt.hpp>
-#include <IniParser.hpp>
-#include <Utils.hpp>
-#include <HostTokenizer.hpp>
+#include "CarobMySQL.hpp"
+#include "CarobStmt.hpp"
+#include "IniParser.hpp"
+#include "Utils.hpp"
+#include "HostTokenizer.hpp"
/* Carob include */
#include <carob/StringCodecs.hpp>
@@ -38,6 +36,8 @@
#include <string>
#include <algorithm>
+#include "config.h"
+
#define MYSEQUOIA_CONFIG_FILE "mysequoia.conf"
#ifndef CONFIGFILE_DIR
Index: libmysequoia/src/MySQLAPI.cpp
diff -u libmysequoia/src/MySQLAPI.cpp:1.72 libmysequoia/src/MySQLAPI.cpp:1.73
--- libmysequoia/src/MySQLAPI.cpp:1.72 Wed Apr 4 16:32:32 2007
+++ libmysequoia/src/MySQLAPI.cpp Wed Apr 4 17:09:37 2007
@@ -19,12 +19,10 @@
* Contributor(s):
*/
-#include <config.h>
+#include "CarobMySQL.hpp"
+#include "CarobStmt.hpp"
-#include <CarobMySQL.hpp>
-#include <CarobStmt.hpp>
-
-#include <Utils.hpp>
+#include "Utils.hpp"
/* Carob include */
#include <carob/Common.hpp>
@@ -50,6 +48,8 @@
#include <string>
#include <fstream>
+#include "config.h"
+
// need two steps to delay expansion of argument
#define STRINGIFY(x) #x
#define TOSTRING(x) STRINGIFY(x)
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
