diff options
author | Constantin Kaplinsky <const@tightvnc.com> | 2006-01-13 10:52:39 +0000 |
---|---|---|
committer | Constantin Kaplinsky <const@tightvnc.com> | 2006-01-13 10:52:39 +0000 |
commit | 4cea5e76c8f9ba67c0ed17aa212cca55e7aa21ed (patch) | |
tree | e51fdeb0f660be6fcf7358cf6e7058270cdd33a0 /rfb | |
parent | d87a7a7a113b6272d584834eb0872fb85eac7322 (diff) | |
download | tigervnc-4cea5e76c8f9ba67c0ed17aa212cca55e7aa21ed.tar.gz tigervnc-4cea5e76c8f9ba67c0ed17aa212cca55e7aa21ed.zip |
Replaced Windows-specific "DWORD" type with more appropriate "void*"
specification, to fix compilation under Unix. Also, added missing
newlines at end of some files.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@469 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'rfb')
-rw-r--r-- | rfb/ListConnInfo.h | 8 | ||||
-rw-r--r-- | rfb/VNCSConnectionST.cxx | 2 | ||||
-rw-r--r-- | rfb/VNCServerST.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/rfb/ListConnInfo.h b/rfb/ListConnInfo.h index 5953004f..cabcbc79 100644 --- a/rfb/ListConnInfo.h +++ b/rfb/ListConnInfo.h @@ -50,7 +50,7 @@ namespace rfb { si++; } - void addInfo(DWORD Conn, char* IP, char* Time, int Status) { + void addInfo(void* Conn, char* IP, char* Time, int Status) { conn.push_back(Conn); IP_address.push_back(strDup(IP)); time_conn.push_back(strDup(Time)); @@ -75,7 +75,7 @@ namespace rfb { } } - DWORD iGetConn() { return *ci;} + void* iGetConn() { return *ci;} int iGetStatus() { return *si;} @@ -107,11 +107,11 @@ namespace rfb { } private: - std::list<DWORD> conn; + std::list<void*> conn; std::list<char*> IP_address; std::list<char*> time_conn; std::list<int> status; - std::list<DWORD>::iterator ci; + std::list<void*>::iterator ci; std::list<char*>::iterator Ii; std::list<char*>::iterator ti; std::list<int>::iterator si; diff --git a/rfb/VNCSConnectionST.cxx b/rfb/VNCSConnectionST.cxx index 8f2ff236..7173758f 100644 --- a/rfb/VNCSConnectionST.cxx +++ b/rfb/VNCSConnectionST.cxx @@ -705,4 +705,4 @@ int VNCSConnectionST::getStatus() bool VNCSConnectionST::processFTMsg(int type) { return false; -}
\ No newline at end of file +} diff --git a/rfb/VNCServerST.cxx b/rfb/VNCServerST.cxx index 9f6ecb5e..0721a3c9 100644 --- a/rfb/VNCServerST.cxx +++ b/rfb/VNCServerST.cxx @@ -516,7 +516,7 @@ void VNCServerST::getConnInfo(ListConnInfo * listConn) return; std::list<VNCSConnectionST*>::iterator i; for (i = clients.begin(); i != clients.end(); i++) - listConn->addInfo((DWORD)(*i), (*i)->getSock()->getPeerAddress(), + listConn->addInfo((void*)(*i), (*i)->getSock()->getPeerAddress(), (*i)->getStartTime(), (*i)->getStatus()); } @@ -539,4 +539,4 @@ void VNCServerST::setConnStatus(ListConnInfo* listConn) } } } -}
\ No newline at end of file +} |