diff options
author | christian mueller <christian.ei.mueller@bmw.de> | 2011-12-22 17:27:16 +0100 |
---|---|---|
committer | christian mueller <christian.ei.mueller@bmw.de> | 2011-12-23 01:36:59 +0100 |
commit | 4f74d6e303c58326fe75ee75e1c92cf9263f800d (patch) | |
tree | da2c725f7cbad20e35169476b801066689a382a2 /AudioManagerDaemon/test/sockethandler/sockethandlerTest.cpp | |
parent | 4618280b6d777ac7bf3bb5cf5b0ea3f0d9e4b2b7 (diff) | |
download | audiomanager-4f74d6e303c58326fe75ee75e1c92cf9263f800d.tar.gz |
* rework of buildsystem
* now everything depends on a toplevel CMakefile
* cleanup of makefiles and compiler options
Diffstat (limited to 'AudioManagerDaemon/test/sockethandler/sockethandlerTest.cpp')
-rw-r--r-- | AudioManagerDaemon/test/sockethandler/sockethandlerTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/AudioManagerDaemon/test/sockethandler/sockethandlerTest.cpp b/AudioManagerDaemon/test/sockethandler/sockethandlerTest.cpp index c9c17cb..bb72324 100644 --- a/AudioManagerDaemon/test/sockethandler/sockethandlerTest.cpp +++ b/AudioManagerDaemon/test/sockethandler/sockethandlerTest.cpp @@ -25,13 +25,13 @@ sockethandlerTest::~sockethandlerTest() { } -void fdCallBack::connectSocket(int fd, const short events,void * userData) +void fdCallBack::connectSocket(int fd, const int16_t events,void * userData) { std::cout<<"Socket connection received and open"<<std::endl; //accept the connection mSocketConnection = accept(fd, NULL, NULL); - short event = 0; + int16_t event = 0; event |=POLLIN; shPollCallBack* buf=&pSocketDataCallback; @@ -52,7 +52,7 @@ fdCallBack::fdCallBack(SocketHandler *SocketHandler) -void am::fdCallBack::handleSocketData(int fd, const short events, void* userdata) +void am::fdCallBack::handleSocketData(int fd, const int16_t events, void* userdata) { char buffer[3000]; std::string msg; @@ -148,7 +148,7 @@ void* playWithSocketServer(void* data) listen(socketHandle, 3); //prepare the event (we want POLLIN because we need to listen) - short event = 0; + int16_t event = 0; event |=POLLIN; shPollCallBack* buf=&testCallback.pSocketConnectionCallback; |