mcatan 2004/04/18 01:09:49
Modified: include/log4cxx/helpers tchar.h threadspecificdata.h
src datagramsocket.cpp socketimpl.cpp
syslogappender.cpp system.cpp
Log:
porting log4cxx to HPUX 11.0 using gcc/gnu, automake, etc/libxml2
Revision Changes Path
1.26 +1 -0 logging-log4cxx/include/log4cxx/helpers/tchar.h
Index: tchar.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/tchar.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- tchar.h 14 Apr 2004 21:51:09 -0000 1.25
+++ tchar.h 18 Apr 2004 08:09:49 -0000 1.26
@@ -95,6 +95,7 @@
#define USES_CONVERSION void * _dst = _alloca(1024);
#endif
#else
+ #include <alloca.h>
#define USES_CONVERSION void * _dst = alloca(1024);
#endif
1.5 +6 -0
logging-log4cxx/include/log4cxx/helpers/threadspecificdata.h
Index: threadspecificdata.h
===================================================================
RCS file:
/home/cvs/logging-log4cxx/include/log4cxx/helpers/threadspecificdata.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- threadspecificdata.h 7 Mar 2004 06:14:00 -0000 1.4
+++ threadspecificdata.h 18 Apr 2004 08:09:49 -0000 1.5
@@ -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
1.5 +3 -0 logging-log4cxx/src/datagramsocket.cpp
Index: datagramsocket.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/datagramsocket.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- datagramsocket.cpp 28 Feb 2004 15:07:50 -0000 1.4
+++ datagramsocket.cpp 18 Apr 2004 08:09:49 -0000 1.5
@@ -151,6 +151,9 @@
#ifdef WIN32
if (::recvfrom(fd, (char *)p->getData(), p->getLength(), 0,
(sockaddr *)&addr, &addr_len) == -1)
+#elif defined(__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)
1.10 +1 -1 logging-log4cxx/src/socketimpl.cpp
Index: socketimpl.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/socketimpl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- socketimpl.cpp 5 Apr 2004 20:53:38 -0000 1.9
+++ socketimpl.cpp 18 Apr 2004 08:09:49 -0000 1.10
@@ -115,7 +115,7 @@
void SocketImpl::accept(SocketImplPtr s)
{
sockaddr_in client_addr;
-#ifdef WIN32
+#ifdef WIN32 || defined(__hpux)
int client_len;
#else
socklen_t client_len;
1.7 +8 -0 logging-log4cxx/src/syslogappender.cpp
Index: syslogappender.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/syslogappender.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- syslogappender.cpp 3 Apr 2004 16:41:15 -0000 1.6
+++ syslogappender.cpp 18 Apr 2004 08:09:49 -0000 1.7
@@ -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;
1.10 +2 -2 logging-log4cxx/src/system.cpp
Index: system.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/system.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- system.cpp 2 Apr 2004 08:50:41 -0000 1.9
+++ system.cpp 18 Apr 2004 08:09:49 -0000 1.10
@@ -73,12 +73,12 @@
throw IllegalArgumentException(_T("key is empty"));
}
-#ifdef WIN32
+#ifdef WIN32 || defined(__hpux)
String strEnv = key + _T("=") + value;
USES_CONVERSION;
::putenv((char *)T2A(strEnv.c_str()));
#else
- /* wARNING !
+ /* WARNING !
We don't use putenv with glibc, because it doesn't make
a copy of the string, but try to keep the pointer
cf. man 3 putenv.
