From: <bi...@us...> - 2008-08-09 15:39:44
|
Revision: 2905 http://oorexx.svn.sourceforge.net/oorexx/?rev=2905&view=rev Author: bigrixx Date: 2008-08-09 15:39:52 +0000 (Sat, 09 Aug 2008) Log Message: ----------- fix linux build errors Modified Paths: -------------- sandbox/rick/rxapi/Makefile.am sandbox/rick/rxapi/common/platform/unix/SysSemaphore.cpp sandbox/rick/rxapi/kernel/platform/unix/ExternalFunctions.cpp sandbox/rick/rxapi/kernel/platform/unix/RexxMain.cpp sandbox/rick/rxapi/kernel/platform/unix/SystemInterpreter.cpp sandbox/rick/rxapi/rexxapi/common/ServiceMessage.hpp sandbox/rick/rxapi/rexxapi/common/platform/unix/SysCSStream.hpp Modified: sandbox/rick/rxapi/Makefile.am =================================================================== --- sandbox/rick/rxapi/Makefile.am 2008-08-09 15:17:41 UTC (rev 2904) +++ sandbox/rick/rxapi/Makefile.am 2008-08-09 15:39:52 UTC (rev 2905) @@ -389,7 +389,6 @@ librexxapi_la_SOURCES = $(build_rexxapi_client_dir)/ClientMessage.cpp \ $(build_rexxapi_client_dir)/LocalAPIContext.cpp \ $(build_rexxapi_client_dir)/LocalAPIManager.cpp \ - $(build_rexxapi_client_dir)/LocalAPISubsystem.cpp \ $(build_rexxapi_client_dir)/LocalMacroSpaceManager.cpp \ $(build_rexxapi_client_dir)/LocalQueueManager.cpp \ $(build_rexxapi_client_dir)/LocalRegistrationManager.cpp \ Modified: sandbox/rick/rxapi/common/platform/unix/SysSemaphore.cpp =================================================================== --- sandbox/rick/rxapi/common/platform/unix/SysSemaphore.cpp 2008-08-09 15:17:41 UTC (rev 2904) +++ sandbox/rick/rxapi/common/platform/unix/SysSemaphore.cpp 2008-08-09 15:39:52 UTC (rev 2905) @@ -74,9 +74,9 @@ * * @param create Indicates whether the semaphore should be created now. */ -SysSemaphore::SysSemaphore(bool create) +SysSemaphore::SysSemaphore(bool createSem) { - if (create) + if (createSem) { create(); } @@ -215,9 +215,9 @@ * * @param create Indicates whether the semaphore should be created now. */ -SysMutex::SysMutex(bool create) +SysMutex::SysMutex(bool createSem) { - if (create) + if (createSem) { create(); } Modified: sandbox/rick/rxapi/kernel/platform/unix/ExternalFunctions.cpp =================================================================== --- sandbox/rick/rxapi/kernel/platform/unix/ExternalFunctions.cpp 2008-08-09 15:17:41 UTC (rev 2904) +++ sandbox/rick/rxapi/kernel/platform/unix/ExternalFunctions.cpp 2008-08-09 15:39:52 UTC (rev 2905) @@ -77,8 +77,6 @@ #include "MethodClass.hpp" #include "SourceFile.hpp" #include "RexxInternalApis.h" /* Get private REXXAPI API's */ -#include "RexxAPIManager.h" -#include "APIUtilities.h" #include "ActivityManager.hpp" #include "ProtectedObject.hpp" #include "StringUtil.hpp" Modified: sandbox/rick/rxapi/kernel/platform/unix/RexxMain.cpp =================================================================== --- sandbox/rick/rxapi/kernel/platform/unix/RexxMain.cpp 2008-08-09 15:17:41 UTC (rev 2904) +++ sandbox/rick/rxapi/kernel/platform/unix/RexxMain.cpp 2008-08-09 15:39:52 UTC (rev 2905) @@ -65,9 +65,7 @@ #include "RexxActivity.hpp" #include "SourceFile.hpp" -#include "RexxAPIManager.h" #include "APIDefinitions.h" -#include "APIUtilities.h" #include "Interpreter.hpp" Modified: sandbox/rick/rxapi/kernel/platform/unix/SystemInterpreter.cpp =================================================================== --- sandbox/rick/rxapi/kernel/platform/unix/SystemInterpreter.cpp 2008-08-09 15:17:41 UTC (rev 2904) +++ sandbox/rick/rxapi/kernel/platform/unix/SystemInterpreter.cpp 2008-08-09 15:39:52 UTC (rev 2905) @@ -49,7 +49,6 @@ #include "RexxCore.h" #include "SystemInterpreter.hpp" #include "Interpreter.hpp" -#include "RexxAPIManager.h" #if defined( HAVE_SIGNAL_H ) # include <signal.h> Modified: sandbox/rick/rxapi/rexxapi/common/ServiceMessage.hpp =================================================================== --- sandbox/rick/rxapi/rexxapi/common/ServiceMessage.hpp 2008-08-09 15:17:41 UTC (rev 2904) +++ sandbox/rick/rxapi/rexxapi/common/ServiceMessage.hpp 2008-08-09 15:39:52 UTC (rev 2905) @@ -370,7 +370,7 @@ { if (messageData != NULL && !retainMessageData) { - delete[] messageData; + delete[] ((char *)messageData); clearMessageData(); } } Modified: sandbox/rick/rxapi/rexxapi/common/platform/unix/SysCSStream.hpp =================================================================== --- sandbox/rick/rxapi/rexxapi/common/platform/unix/SysCSStream.hpp 2008-08-09 15:17:41 UTC (rev 2904) +++ sandbox/rick/rxapi/rexxapi/common/platform/unix/SysCSStream.hpp 2008-08-09 15:39:52 UTC (rev 2905) @@ -36,6 +36,9 @@ /*----------------------------------------------------------------------------*/ +#ifndef SysCSStream_Included +#define SysCSStream_Included + #include <netinet/in.h> @@ -58,7 +61,7 @@ { protected: CSErrorCodeT errcode; - SOCKET c; // client socket + int c; // client socket int domain; // the socket domain int type; // the socket type int protocol; // the socket protocol @@ -117,7 +120,7 @@ protected: SysServerStream *server; - SOCKET c; // client socket + int c; // client socket CSErrorCodeT errcode; }; @@ -126,7 +129,7 @@ { protected: CSErrorCodeT errcode; - SOCKET s; // server socket + int s; // server socket int domain; // the socket domain int type; // the socket type int protocol; // the socket protocol @@ -168,4 +171,4 @@ return errcode == CSERROR_OK; } }; - +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |