trunk/branch integration: Event & Mutex

This commit is contained in:
Marian Krivos
2011-08-23 06:55:12 +00:00
parent a0997d01db
commit 05041e2689
4 changed files with 15 additions and 13 deletions

View File

@@ -47,6 +47,8 @@
#include "Poco/NamedEvent_WIN32U.h" #include "Poco/NamedEvent_WIN32U.h"
#elif defined(POCO_OS_FAMILY_WINDOWS) #elif defined(POCO_OS_FAMILY_WINDOWS)
#include "Poco/NamedEvent_WIN32.h" #include "Poco/NamedEvent_WIN32.h"
#elif defined(POCO_ANDROID)
#include "Poco/NamedEvent_Android.h"
#elif defined(POCO_OS_FAMILY_UNIX) #elif defined(POCO_OS_FAMILY_UNIX)
#include "Poco/NamedEvent_UNIX.h" #include "Poco/NamedEvent_UNIX.h"
#else #else

View File

@@ -41,7 +41,7 @@
#include "Poco/Foundation.h" #include "Poco/Foundation.h"
#if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) #if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) || defined(_AIX)
#include <semaphore.h> #include <semaphore.h>
#endif #endif
@@ -58,13 +58,13 @@ protected:
void waitImpl(); void waitImpl();
private: private:
std::string getFileName(); std::string getFileName();
std::string _name; std::string _name;
#if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) #if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) || defined(_AIX)
sem_t* _sem; sem_t* _sem;
#else #else
int _lockfd; // lock file descriptor int _lockfd; // lock file descriptor
int _semfd; // file used to identify semaphore int _semfd; // file used to identify semaphore
int _semid; // semaphore id int _semid; // semaphore id
#endif #endif

View File

@@ -1,7 +1,7 @@
// //
// NamedMutex.h // NamedMutex.h
// //
// $Id: //poco/svn/Foundation/include/Poco/NamedMutex.h#2 $ // $Id: //poco/1.4/Foundation/include/Poco/NamedMutex.h#2 $
// //
// Library: Foundation // Library: Foundation
// Package: Processes // Package: Processes

View File

@@ -43,7 +43,7 @@
#include "Poco/Foundation.h" #include "Poco/Foundation.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) #if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) || defined(_AIX)
#include <semaphore.h> #include <semaphore.h>
#endif #endif
@@ -61,13 +61,13 @@ protected:
void unlockImpl(); void unlockImpl();
private: private:
std::string getFileName(); std::string getFileName();
std::string _name; std::string _name;
#if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) #if defined(sun) || defined(__APPLE__) || defined(__osf__) || defined(__QNX__) || defined(_AIX)
sem_t* _sem; sem_t* _sem;
#else #else
int _lockfd; // lock file descriptor int _lockfd; // lock file descriptor
int _semfd; // file used to identify semaphore int _semfd; // file used to identify semaphore
int _semid; // semaphore id int _semid; // semaphore id
#endif #endif