From 4e71ffdc56f117e3f3fc13c8e6203c99966ca4dc Mon Sep 17 00:00:00 2001
From: rylek <rylek@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 8 Aug 2011 08:58:36 +0000
Subject: [PATCH] .Oracle: added default POSIX names for OCI libraries
 (libclntsh.so)

git-svn-id: svn://ultimatepp.org/upp/trunk@3755 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Oracle/Oci7.cpp    |  7 ++++++-
 uppsrc/Oracle/Oci8.cpp    | 11 ++++++++---
 uppsrc/Sql/MassInsert.cpp |  5 +++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/uppsrc/Oracle/Oci7.cpp b/uppsrc/Oracle/Oci7.cpp
index 309da8f3a..32cf46e39 100644
--- a/uppsrc/Oracle/Oci7.cpp
+++ b/uppsrc/Oracle/Oci7.cpp
@@ -16,7 +16,12 @@ typedef byte text;
 
 NAMESPACE_UPP
 
-#define DLLFILENAME "ociw32.dll"
+#ifdef PLATFORM_WIN32
+	#define DLLFILENAME "ociw32.dll"
+#else
+	#define DLLFILENAME "libclntsh.so"
+#endif
+
 #define DLIMODULE   OCI7
 #define DLIHEADER   <Oracle/Oci7.dli>
 #include <Core/dli_source.h>
diff --git a/uppsrc/Oracle/Oci8.cpp b/uppsrc/Oracle/Oci8.cpp
index 023413c87..81d7e5102 100644
--- a/uppsrc/Oracle/Oci8.cpp
+++ b/uppsrc/Oracle/Oci8.cpp
@@ -7,7 +7,12 @@ NAMESPACE_UPP
 #define LLOG(x) RLOG(x)
 
 //#define DLLFILENAME "ora803.dll"
-#define DLLFILENAME "oci.dll"
+#ifdef PLATFORM_WIN32
+	#define DLLFILENAME "oci.dll"
+#else
+	#define DLLFILENAME "libclntsh.so"
+#endif
+
 #define DLIMODULE   OCI8
 #define DLIHEADER   <Oracle/Oci8.dli>
 #include <Core/dli_source.h>
@@ -1495,7 +1500,7 @@ void OracleBlob::Write(int64 at, const void *ptr, dword size) {
 
 void OracleBlob::Assign(Oracle8& s, int64 blob) {
 	session = &s;
-	locp = (OCILobLocator *)blob;
+	locp = (OCILobLocator *)(ptrdiff_t)blob;
 	ub4 n;
 	OpenInit(READWRITE,
 		session->oci8.OCILobGetLength(session->svchp, session->errhp, locp, &n) == OCI_SUCCESS ? n : 0);
@@ -1669,7 +1674,7 @@ void OracleClob::Write(const WString& w)
 
 void OracleClob::Assign(Oracle8& s, int64 blob) {
 	session = &s;
-	locp = (OCILobLocator *)blob;
+	locp = (OCILobLocator *)(ptrdiff_t)blob;
 	ub4 n;
 	OpenInit(READWRITE,
 		session->oci8.OCILobGetLength(session->svchp, session->errhp, locp, &n) == OCI_SUCCESS
diff --git a/uppsrc/Sql/MassInsert.cpp b/uppsrc/Sql/MassInsert.cpp
index 4430f3e62..e8fb4972d 100644
--- a/uppsrc/Sql/MassInsert.cpp
+++ b/uppsrc/Sql/MassInsert.cpp
@@ -1,6 +1,6 @@
 #include "Sql.h"
 
-namespace Upp {
+NAMESPACE_UPP
 
 SqlMassInsert::~SqlMassInsert()
 {
@@ -84,4 +84,5 @@ void SqlMassInsert::Flush()
 	pos = 0;
 }
 
-};
+END_UPP_NAMESPACE
+