[glom/glom-1-20] More windows build fixes.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom/glom-1-20] More windows build fixes.
- Date: Tue, 6 Mar 2012 09:51:48 +0000 (UTC)
commit ccb4e7750ddb1e16973809cbfd048a33bf0064bb
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Mar 1 09:18:08 2012 +0100
More windows build fixes.
* glom/libglom/connectionpool_backends/postgres.cc: Add an include and change
the ifdefed code slightly to fix the mingw build on Windows.
Bug #670903 (alien)
ChangeLog | 8 ++++++++
glom/libglom/connectionpool_backends/postgres.cc | 3 ++-
2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d8bd707..2727a68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2012-03-01 Murray Cumming <murrayc murrayc com>
+ More windows build fixes.
+
+ * glom/libglom/connectionpool_backends/postgres.cc: Add an include and change
+ the ifdefed code slightly to fix the mingw build on Windows.
+ Bug #670903 (alien)
+
+2012-03-01 Murray Cumming <murrayc murrayc com>
+
Add a fcntl.h include.
* glom/libglom/utils.cc: Include fcntl.h to fix the mingw build
diff --git a/glom/libglom/connectionpool_backends/postgres.cc b/glom/libglom/connectionpool_backends/postgres.cc
index a6b8ee9..9d5eeeb 100644
--- a/glom/libglom/connectionpool_backends/postgres.cc
+++ b/glom/libglom/connectionpool_backends/postgres.cc
@@ -28,6 +28,7 @@
#include <libgdamm/config.h>
#include <giomm/file.h>
#include <glibmm/convert.h>
+#include <glibmm/fileutils.h> //For Glib::file_test().
#include <glibmm/miscutils.h>
#include <glibmm/shell.h>
#include <glib/gstdio.h> /* For g_rename(). TODO: Wrap this in glibmm? */
@@ -474,7 +475,7 @@ std::string Postgres::get_path_to_postgres_executable(const std::string& program
if(Glib::file_test(test, Glib::FILE_TEST_IS_EXECUTABLE))
{
if(quoted)
- test = Glib::shell_quote(path);
+ test = Glib::shell_quote(test);
return test;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]