diff options
Diffstat (limited to 'connectivity/source/inc')
-rw-r--r-- | connectivity/source/inc/odbc/OConnection.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/odbc/ODriver.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/odbc/OFunctiondefs.hxx | 104 | ||||
-rw-r--r-- | connectivity/source/inc/odbc/OFunctions.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/odbc/OTools.hxx | 2 |
5 files changed, 4 insertions, 108 deletions
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index bdf46b6ac3cf..37f730bc1a4d 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/sdbc/SQLWarning.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include "odbc/OFunctiondefs.hxx" +#include <connectivity/odbc.hxx> #include "odbc/odbcbasedllapi.hxx" #include <connectivity/OSubComponent.hxx> #include <connectivity/CommonTools.hxx> diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx index f225bd002d32..210a543924c9 100644 --- a/connectivity/source/inc/odbc/ODriver.hxx +++ b/connectivity/source/inc/odbc/ODriver.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/compbase2.hxx> -#include "odbc/OFunctiondefs.hxx" +#include <connectivity/odbc.hxx> #include "odbc/odbcbasedllapi.hxx" #include <connectivity/CommonTools.hxx> #include <osl/module.h> diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx deleted file mode 100644 index d241ddcc209c..000000000000 --- a/connectivity/source/inc/odbc/OFunctiondefs.hxx +++ /dev/null @@ -1,104 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OFUNCTIONDEFS_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OFUNCTIONDEFS_HXX - -#if defined(WNT) - -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable:4005) -#endif - -// just to go with calling convention of windows -#if SYSTEM_ODBC_HEADERS -#include <windows.h> -#define SQL_API __stdcall -#include <sqlext.h> -#else -#define SQL_API __stdcall -#include <odbc/sqlext.h> -#endif -#undef SQL_API -#define SQL_API __stdcall - -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -#ifndef SQL_C_BOOKMARK -#define SQL_C_BOOKMARK SQL_C_ULONG /* BOOKMARK */ -#endif - -#ifndef SQL_OPT_TRACE_OFF -#define SQL_OPT_TRACE_OFF 0UL -#endif - -#define SDB_ODBC_CHAR UCHAR - -#endif - - - -#ifdef UNX - -#ifndef ODBC_UNX -#define ODBC_UNX -#endif -#define CALLBACK -#define EXPORT -#ifdef SYSTEM_ODBC_HEADERS -#include <sqlext.h> -#else -#include <odbc/sqlext.h> -#endif - -#define SDB_ODBC_CHAR UCHAR - -#endif // UNX - - - -#ifndef SQL_WCHAR -#define SQL_WCHAR (-8) -#endif -#ifndef SQL_WVARCHAR -#define SQL_WVARCHAR (-9) -#endif -#ifndef SQL_WLONGVARCHAR -#define SQL_WLONGVARCHAR (-10) -#endif -#ifndef SQL_C_WCHAR -#define SQL_C_WCHAR SQL_WCHAR -#endif - -#ifndef SQL_C_TCHAR -#ifdef UNICODE -#define SQL_C_TCHAR SQL_C_WCHAR -#else -#define SQL_C_TCHAR SQL_C_CHAR -#endif -#endif - -#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OFUNCTIONDEFS_HXX - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx index 1ead6bb93481..feeda59537a0 100644 --- a/connectivity/source/inc/odbc/OFunctions.hxx +++ b/connectivity/source/inc/odbc/OFunctions.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OFUNCTIONS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OFUNCTIONS_HXX -#include "odbc/OFunctiondefs.hxx" +#include <connectivity/odbc.hxx> #include <rtl/ustring.hxx> #include <osl/module.h> diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx index d9b812763ebc..ff07cd069280 100644 --- a/connectivity/source/inc/odbc/OTools.hxx +++ b/connectivity/source/inc/odbc/OTools.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OTOOLS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OTOOLS_HXX -#include "odbc/OFunctiondefs.hxx" +#include <connectivity/odbc.hxx> #include "odbc/odbcbasedllapi.hxx" #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/util/Date.hpp> |