Date: Wednesday, September 20, 2006 @ 17:09:29
Author: gilles
Path: /cvsroot/carob/carob
Modified: contrib/CPP/read_example.cpp (1.7 -> 1.8) include/Common.hpp
(1.45 -> 1.46) include/ConnectionParameters.hpp (1.27 -> 1.28)
include/JavaSocket.hpp (1.29 -> 1.30)
include/SystemDependantDefs.hpp (1.3 -> 1.4) src/Common.cpp
(1.43 -> 1.44) src/Connection.cpp (1.89 -> 1.90)
src/JavaSocket.cpp (1.50 -> 1.51) src/ParameterStatement.cpp
(1.32 -> 1.33) src/SQLDataSerialization.cpp (1.34 -> 1.35)
test/10-Connection/TestFailOver.cpp (1.5 -> 1.6)
test/40-Parameter-PreparedStatement/TestIEEE754.cpp (1.13 ->
1.14)
Changed flag __WIN32__ to __MINGW32__ to be more specific and let room for
future (?) vc++ compilations
-----------------------------------------------------+
contrib/CPP/read_example.cpp | 6 +++---
include/Common.hpp | 2 +-
include/ConnectionParameters.hpp | 2 +-
include/JavaSocket.hpp | 2 +-
include/SystemDependantDefs.hpp | 2 +-
src/Common.cpp | 2 +-
src/Connection.cpp | 2 +-
src/JavaSocket.cpp | 10 +++++-----
src/ParameterStatement.cpp | 4 ++--
src/SQLDataSerialization.cpp | 2 +-
test/10-Connection/TestFailOver.cpp | 2 +-
test/40-Parameter-PreparedStatement/TestIEEE754.cpp | 4 ++--
12 files changed, 20 insertions(+), 20 deletions(-)
Index: carob/contrib/CPP/read_example.cpp
diff -u carob/contrib/CPP/read_example.cpp:1.7
carob/contrib/CPP/read_example.cpp:1.8
--- carob/contrib/CPP/read_example.cpp:1.7 Wed Jul 26 16:31:47 2006
+++ carob/contrib/CPP/read_example.cpp Wed Sep 20 17:09:29 2006
@@ -34,7 +34,7 @@
#include "Common.hpp"
#include <iostream>
#include <vector>
-#ifdef __WIN32__
+#ifdef __MINGW32__
//#pragma comment(lib, "ws2_32.lib")
#include <winsock2.h>
#endif
@@ -45,7 +45,7 @@
int main(int argc, char *argv[])
{
-#ifdef __WIN32__
+#ifdef __MINGW32__
//init windows socket lib
WSADATA WSAData;
if (isInfoEnabled())
@@ -115,7 +115,7 @@
{
wcout<<L"An unknow error occured"<<endl;
}
-#ifdef __WIN32__
+#ifdef __MINGW32__
WSACleanup();
#endif
}
Index: carob/include/Common.hpp
diff -u carob/include/Common.hpp:1.45 carob/include/Common.hpp:1.46
--- carob/include/Common.hpp:1.45 Thu Jul 27 17:10:42 2006
+++ carob/include/Common.hpp Wed Sep 20 17:09:29 2006
@@ -36,7 +36,7 @@
#define WIDENMACRO(macro) WIDENLITERAL(macro)
#define __WFILE__ WIDENMACRO(__FILE__)
-#ifdef __WIN32__
+#ifdef __MINGW32__
#define _UNICODE
#define _WIN32_WINNT 0x0501 // workaround to have getaddrinfo function
Index: carob/include/ConnectionParameters.hpp
diff -u carob/include/ConnectionParameters.hpp:1.27
carob/include/ConnectionParameters.hpp:1.28
--- carob/include/ConnectionParameters.hpp:1.27 Thu Jul 27 17:10:53 2006
+++ carob/include/ConnectionParameters.hpp Wed Sep 20 17:09:29 2006
@@ -25,7 +25,7 @@
#include "ControllerPool.hpp"
#include "CarobException.hpp"
-#ifdef __WIN32__
+#ifdef __MINGW32__
#include <winsock2.h>
#include <ws2tcpip.h>
#include "Common.hpp" //for in_port_t
Index: carob/include/JavaSocket.hpp
diff -u carob/include/JavaSocket.hpp:1.29 carob/include/JavaSocket.hpp:1.30
--- carob/include/JavaSocket.hpp:1.29 Thu May 11 15:42:51 2006
+++ carob/include/JavaSocket.hpp Wed Sep 20 17:09:29 2006
@@ -29,7 +29,7 @@
#include <string>
-#ifdef __WIN32__
+#ifdef __MINGW32__
#include <winsock2.h>
#else
#include <netinet/in.h> //for in_addr_t
Index: carob/include/SystemDependantDefs.hpp
diff -u carob/include/SystemDependantDefs.hpp:1.3
carob/include/SystemDependantDefs.hpp:1.4
--- carob/include/SystemDependantDefs.hpp:1.3 Wed Jan 11 20:03:05 2006
+++ carob/include/SystemDependantDefs.hpp Wed Sep 20 17:09:29 2006
@@ -48,7 +48,7 @@
/** Write options. Flag given for each send() on the socket */
const int SOCKET_SEND_FLAGS = 0
-#ifndef SO_NOSIGPIPE //*nix
+#if !defined SO_NOSIGPIPE && !defined __MINGW32__ //*nix
|MSG_NOSIGNAL
#endif
;
Index: carob/src/Common.cpp
diff -u carob/src/Common.cpp:1.43 carob/src/Common.cpp:1.44
--- carob/src/Common.cpp:1.43 Thu Jul 27 17:10:42 2006
+++ carob/src/Common.cpp Wed Sep 20 17:09:29 2006
@@ -29,7 +29,7 @@
#include <log4cxx/logger.h>
#endif
-#ifndef __WIN32__
+#ifndef __MINGW32__
#include <stdint.h> // for uint8_t, int32_t, uint32_t, int64_t, uint64_t
// Alternative:
// #include <cstdint>
Index: carob/src/Connection.cpp
diff -u carob/src/Connection.cpp:1.89 carob/src/Connection.cpp:1.90
--- carob/src/Connection.cpp:1.89 Wed Aug 30 09:37:12 2006
+++ carob/src/Connection.cpp Wed Sep 20 17:09:29 2006
@@ -35,7 +35,7 @@
#include <string>
-#ifdef __WIN32__
+#ifdef __MINGW32__
#define sleep _sleep
#else
#include <unistd.h> // sleep()
Index: carob/src/JavaSocket.cpp
diff -u carob/src/JavaSocket.cpp:1.50 carob/src/JavaSocket.cpp:1.51
--- carob/src/JavaSocket.cpp:1.50 Thu Jul 27 17:10:42 2006
+++ carob/src/JavaSocket.cpp Wed Sep 20 17:09:29 2006
@@ -24,7 +24,7 @@
#include "Common.hpp"
#include "SystemDependantDefs.hpp"
-#ifdef __WIN32__
+#ifdef __MINGW32__
#include <ws2tcpip.h>
#define __BYTE_ORDER BYTE_ORDER
#else
@@ -73,7 +73,7 @@
if (!blocking)
{
-#ifdef __WIN32__
+#ifdef __MINGW32__
int var = 1;
ioctlsocket(socketFd, FIONBIO, (u_long FAR*) &var);
if (var == 0)
@@ -148,7 +148,7 @@
if (error)
{
-#ifdef __WIN32__
+#ifdef __MINGW32__
wstring wMsg = L"Error while executing getaddrinfo().";
#else
const char* gaiMsg = gai_strerror(error);
@@ -197,14 +197,14 @@
wstring fctName(L"closeSocket");
if (isValid())
{
-#ifdef __WIN32__
+#ifdef __MINGW32__
if (closesocket(socketFd) != 0)
#else
if (close(socketFd) != 0)
#endif
{
wstring msg(L"Could not close socket. Error code is ");
-#ifdef __WIN32__
+#ifdef __MINGW32__
msg += toUserString(WSAGetLastError());
#else
msg += toUserString(errno);
Index: carob/src/ParameterStatement.cpp
diff -u carob/src/ParameterStatement.cpp:1.32
carob/src/ParameterStatement.cpp:1.33
--- carob/src/ParameterStatement.cpp:1.32 Fri Aug 4 15:48:59 2006
+++ carob/src/ParameterStatement.cpp Wed Sep 20 17:09:29 2006
@@ -28,13 +28,13 @@
#include <sstream>
-#ifdef __WIN32__
+#ifdef __MINGW32__
#include "math.h" // C
#else
#include <cmath> // C++
#endif
-#ifndef __WIN32__
+#ifndef __MINGW32__
using std::signbit; // so to be C/C++ ambiguous?
#endif
Index: carob/src/SQLDataSerialization.cpp
diff -u carob/src/SQLDataSerialization.cpp:1.34
carob/src/SQLDataSerialization.cpp:1.35
--- carob/src/SQLDataSerialization.cpp:1.34 Fri May 5 19:00:56 2006
+++ carob/src/SQLDataSerialization.cpp Wed Sep 20 17:09:29 2006
@@ -35,7 +35,7 @@
// - same standard binary representation as the one sent
// by Java's DataOutput class
-#if !defined __STDC_IEC_559__ && !defined __WIN32__
+#if !defined __STDC_IEC_559__ && !defined __MINGW32__
#error "only IEEE 754 platforms are supported"
#endif
// run-time equivalent is: numeric_limits<double|float>.is_iec559()
Index: carob/test/10-Connection/TestFailOver.cpp
diff -u carob/test/10-Connection/TestFailOver.cpp:1.5
carob/test/10-Connection/TestFailOver.cpp:1.6
--- carob/test/10-Connection/TestFailOver.cpp:1.5 Wed Jul 26 16:31:47 2006
+++ carob/test/10-Connection/TestFailOver.cpp Wed Sep 20 17:09:29 2006
@@ -34,7 +34,7 @@
using std::wstring;
-#ifdef __WIN32__
+#ifdef __MINGW32__
#define sleep _sleep
#endif
Index: carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp
diff -u carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp:1.13
carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp:1.14
--- carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp:1.13 Fri May
5 19:00:56 2006
+++ carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp Wed Sep 20
17:09:29 2006
@@ -36,14 +36,14 @@
#define INSERT_STMT L"insert into " TABLE_NAME L" values (?, ?, ?)"
#define RETRIEVE_STMT L"select * from " TABLE_NAME
-#if !defined __STDC_IEC_559__ && !defined __WIN32__
+#if !defined __STDC_IEC_559__ && !defined __MINGW32__
#error only IEEE 754 platforms are supported
#endif
#include <iostream>
-#ifndef __WIN32__
+#ifndef __MINGW32__
using std::signbit;
#endif
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
