Thanks for all your efforts with log4cxx
Attached are a few diffs after porting log4cxx to HPUX 11.0 using gcc/gnu
automake etc/libxml2
Most diffs should be fairly self evident. I fyou need an explaination please
ask. After applying these diffs, I compiled on a linux/x86 box just to
ensure I did not break anything.
Cheers,
Jwahar Bammi
Memento, Inc.
[EMAIL PROTECTED]
Index: include/log4cxx/helpers/threadspecificdata.h
===================================================================
--- include/log4cxx/helpers/threadspecificdata.h (revision 999)
+++ include/log4cxx/helpers/threadspecificdata.h (working copy)
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_HELPERS_THREAD_SPECIFIC_DATA_H
#define _LOG4CXX_HELPERS_THREAD_SPECIFIC_DATA_H
+#include <log4cxx/config.h>
+
+#ifdef HAVE_PTHREAD
+#include <pthread.h>
+#endif
+
namespace log4cxx
{
namespace helpers
Index: include/log4cxx/helpers/tchar.h
===================================================================
--- include/log4cxx/helpers/tchar.h (revision 999)
+++ include/log4cxx/helpers/tchar.h (working copy)
@@ -95,6 +95,7 @@
#define USES_CONVERSION void * _dst = _alloca(1024);
#endif
#else
+ #include <alloca.h>
#define USES_CONVERSION void * _dst = alloca(1024);
#endif
Index: src/syslogappender.cpp
===================================================================
--- src/syslogappender.cpp (revision 999)
+++ src/syslogappender.cpp (working copy)
@@ -133,8 +133,12 @@
case LOG_NEWS: return _T("news");
case LOG_UUCP: return _T("uucp");
case LOG_CRON: return _T("cron");
+#ifdef LOG_AUTHPRIV
case LOG_AUTHPRIV: return _T("authpriv");
+#endif
+#ifdef LOG_FTP
case LOG_FTP: return _T("ftp");
+#endif
case LOG_LOCAL0: return _T("local0");
case LOG_LOCAL1: return _T("local1");
case LOG_LOCAL2: return _T("local2");
@@ -192,14 +196,18 @@
{
return LOG_CRON;
}
+#ifdef LOG_AUTHPRIV
else if (s == _T("AUTHPRIV"))
{
return LOG_AUTHPRIV;
}
+#endif
+#ifdef LOG_FTP
else if (s == _T("FTP"))
{
return LOG_FTP;
}
+#endif
else if (s == _T("LOCAL0"))
{
return LOG_LOCAL0;
@@ -337,4 +345,3 @@
this->initSyslogFacilityStr();
}
-
Index: src/socketimpl.cpp
===================================================================
--- src/socketimpl.cpp (revision 999)
+++ src/socketimpl.cpp (working copy)
@@ -115,7 +115,7 @@
void SocketImpl::accept(SocketImplPtr s)
{
sockaddr_in client_addr;
-#ifdef WIN32
+#if defined(WIN32) || defined(__hpux)
int client_len;
#else
socklen_t client_len;
Index: src/system.cpp
===================================================================
--- src/system.cpp (revision 999)
+++ src/system.cpp (working copy)
@@ -73,7 +73,7 @@
throw IllegalArgumentException(_T("key is empty"));
}
-#ifdef WIN32
+#if defined(WIN32) || defined(__hpux)
String strEnv = key + _T("=") + value;
USES_CONVERSION;
::putenv((char *)T2A(strEnv.c_str()));
Index: src/datagramsocket.cpp
===================================================================
--- src/datagramsocket.cpp (revision 999)
+++ src/datagramsocket.cpp (working copy)
@@ -152,9 +152,14 @@
if (::recvfrom(fd, (char *)p->getData(), p->getLength(), 0,
(sockaddr *)&addr, &addr_len) == -1)
#else
+#ifdef __hpux
if (::recvfrom(fd, p->getData(), p->getLength(), 0,
+ (sockaddr *)&addr, &addr_len) == -1)
+#else
+ if (::recvfrom(fd, p->getData(), p->getLength(), 0,
(sockaddr *)&addr, (socklen_t *)&addr_len) == -1)
#endif
+#endif
{
throw IOException();
}
@@ -184,4 +189,3 @@
}
-
Index: include/log4cxx/helpers/threadspecificdata.h
===================================================================
--- include/log4cxx/helpers/threadspecificdata.h (revision 999)
+++ include/log4cxx/helpers/threadspecificdata.h (working copy)
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_HELPERS_THREAD_SPECIFIC_DATA_H
#define _LOG4CXX_HELPERS_THREAD_SPECIFIC_DATA_H
+#include <log4cxx/config.h>
+
+#ifdef HAVE_PTHREAD
+#include <pthread.h>
+#endif
+
namespace log4cxx
{
namespace helpers
Index: include/log4cxx/helpers/tchar.h
===================================================================
--- include/log4cxx/helpers/tchar.h (revision 999)
+++ include/log4cxx/helpers/tchar.h (working copy)
@@ -95,6 +95,7 @@
#define USES_CONVERSION void * _dst = _alloca(1024);
#endif
#else
+ #include <alloca.h>
#define USES_CONVERSION void * _dst = alloca(1024);
#endif
Index: src/syslogappender.cpp
===================================================================
--- src/syslogappender.cpp (revision 999)
+++ src/syslogappender.cpp (working copy)
@@ -133,8 +133,12 @@
case LOG_NEWS: return _T("news");
case LOG_UUCP: return _T("uucp");
case LOG_CRON: return _T("cron");
+#ifdef LOG_AUTHPRIV
case LOG_AUTHPRIV: return _T("authpriv");
+#endif
+#ifdef LOG_FTP
case LOG_FTP: return _T("ftp");
+#endif
case LOG_LOCAL0: return _T("local0");
case LOG_LOCAL1: return _T("local1");
case LOG_LOCAL2: return _T("local2");
@@ -192,14 +196,18 @@
{
return LOG_CRON;
}
+#ifdef LOG_AUTHPRIV
else if (s == _T("AUTHPRIV"))
{
return LOG_AUTHPRIV;
}
+#endif
+#ifdef LOG_FTP
else if (s == _T("FTP"))
{
return LOG_FTP;
}
+#endif
else if (s == _T("LOCAL0"))
{
return LOG_LOCAL0;
@@ -337,4 +345,3 @@
this->initSyslogFacilityStr();
}
-
Index: src/socketimpl.cpp
===================================================================
--- src/socketimpl.cpp (revision 999)
+++ src/socketimpl.cpp (working copy)
@@ -115,7 +115,7 @@
void SocketImpl::accept(SocketImplPtr s)
{
sockaddr_in client_addr;
-#ifdef WIN32
+#if defined(WIN32) || defined(__hpux)
int client_len;
#else
socklen_t client_len;
Index: src/system.cpp
===================================================================
--- src/system.cpp (revision 999)
+++ src/system.cpp (working copy)
@@ -73,7 +73,7 @@
throw IllegalArgumentException(_T("key is empty"));
}
-#ifdef WIN32
+#if defined(WIN32) || defined(__hpux)
String strEnv = key + _T("=") + value;
USES_CONVERSION;
::putenv((char *)T2A(strEnv.c_str()));
Index: src/datagramsocket.cpp
===================================================================
--- src/datagramsocket.cpp (revision 999)
+++ src/datagramsocket.cpp (working copy)
@@ -152,9 +152,14 @@
if (::recvfrom(fd, (char *)p->getData(), p->getLength(), 0,
(sockaddr *)&addr, &addr_len) == -1)
#else
+#ifdef __hpux
if (::recvfrom(fd, p->getData(), p->getLength(), 0,
+ (sockaddr *)&addr, &addr_len) == -1)
+#else
+ if (::recvfrom(fd, p->getData(), p->getLength(), 0,
(sockaddr *)&addr, (socklen_t *)&addr_len) == -1)
#endif
+#endif
{
throw IOException();
}
@@ -184,4 +189,3 @@
}
-
