[Libreoffice-commits] core.git: connectivity/source

[Stephan Bergmann]

 connectivity/source/inc/ado/Aolevariant.hxx |    4 ++--
 connectivity/source/inc/ado/Awrapado.hxx    |    4 ++--
 connectivity/source/inc/ado/Awrapadox.hxx   |    4 ++--
 connectivity/source/inc/ado/WrapColumn.hxx  |    4 ++--
 connectivity/source/inc/ado/adoimp.hxx      |    4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 7ad68b82d252003f6c9233ea74d99f29f25016f0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 2 18:40:54 2017 +0100

    Move ado_{pre,post}_sys_include.h
    
    ...to connectivity/source/inc/ado/, as it is included from include files there,
    which only happens to work because of -I$(dir $(3)) in
    gb_CObject__command_pattern (in solenv/gbuild/platform/com_MSC_class.mk) and the
    fact that those include files in connectivity/source/inc/ado/ are in turn only
    included from .cxx files in connectivity/source/drivers/ado/.
    
    Change-Id: I0bbecaeeaac1f94fa86355e391d2826f3e29c440
    Reviewed-on: https://gerrit.libreoffice.org/44230
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx
index 37c0725b02c7..a9af47ee042e 100644
--- a/connectivity/source/inc/ado/Aolevariant.hxx
+++ b/connectivity/source/inc/ado/Aolevariant.hxx
@@ -23,9 +23,9 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <ado_pre_sys_include.h>
+#include <ado/ado_pre_sys_include.h>
 #include <oaidl.h>
-#include <ado_post_sys_include.h>
+#include <ado/ado_post_sys_include.h>
 
 namespace com
 {
diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx
index e12239791149..f8b6d818f6d7 100644
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
@@ -22,11 +22,11 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 // Includes for ADO
-#include <ado_pre_sys_include.h>
+#include <ado/ado_pre_sys_include.h>
 #include <oledb.h>
 #include <ocidl.h>
 #include <adoint.h>
-#include <ado_post_sys_include.h>
+#include <ado/ado_post_sys_include.h>
 #include <ado/adoimp.hxx>
 #include <ado/Aolewrap.hxx>
 #include <ado/Aolevariant.hxx>
diff --git a/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx
index 3b3c8583371f..83374761ac9b 100644
--- a/connectivity/source/inc/ado/Awrapadox.hxx
+++ b/connectivity/source/inc/ado/Awrapadox.hxx
@@ -53,10 +53,10 @@ typedef struct _ADOTable Table;
 #endif
 
 
-#include <ado_pre_sys_include.h>
+#include <ado/ado_pre_sys_include.h>
 #include <adoint.h>
 #include <adoctint.h>
-#include <ado_post_sys_include.h>
+#include <ado/ado_post_sys_include.h>
 
 
 #include <ado/Aolewrap.hxx>
diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx
index 9548c7890479..fd50fee44287 100644
--- a/connectivity/source/inc/ado/WrapColumn.hxx
+++ b/connectivity/source/inc/ado/WrapColumn.hxx
@@ -21,9 +21,9 @@
 
 #include <ado/Aolewrap.hxx>
 
-#include <ado_pre_sys_include.h>
+#include <ado/ado_pre_sys_include.h>
 #include <adoint.h>
-#include <ado_post_sys_include.h>
+#include <ado/ado_post_sys_include.h>
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/ado/ado_post_sys_include.h b/connectivity/source/inc/ado/ado_post_sys_include.h
similarity index 100%
rename from connectivity/source/drivers/ado/ado_post_sys_include.h
rename to connectivity/source/inc/ado/ado_post_sys_include.h
diff --git a/connectivity/source/drivers/ado/ado_pre_sys_include.h b/connectivity/source/inc/ado/ado_pre_sys_include.h
similarity index 100%
rename from connectivity/source/drivers/ado/ado_pre_sys_include.h
rename to connectivity/source/inc/ado/ado_pre_sys_include.h
diff --git a/connectivity/source/inc/ado/adoimp.hxx b/connectivity/source/inc/ado/adoimp.hxx
index 1459d56f8bf7..a0ab03e369ee 100644
--- a/connectivity/source/inc/ado/adoimp.hxx
+++ b/connectivity/source/inc/ado/adoimp.hxx
@@ -21,9 +21,9 @@
 
 #include <com/sun/star/sdbc/SQLException.hpp>
 
-#include <ado_pre_sys_include.h>
+#include <ado/ado_pre_sys_include.h>
 #include <adoctint.h>
-#include <ado_post_sys_include.h>
+#include <ado/ado_post_sys_include.h>
 
 struct ADOConnection;
 namespace connectivity