summaryrefslogtreecommitdiffstats
path: root/common/network
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2008-10-06 14:08:00 +0000
committerAdam Tkac <atkac@redhat.com>2008-10-06 14:08:00 +0000
commitad1cbd968f8a2b98e241fab731f9655e43b403bb (patch)
tree9c90f456cdec839fe1bda255b5409eb5caaf68cb /common/network
parent1d2920e9d6b30c3577d0dc1d2e73c6bfe885496a (diff)
downloadtigervnc-ad1cbd968f8a2b98e241fab731f9655e43b403bb.tar.gz
tigervnc-ad1cbd968f8a2b98e241fab731f9655e43b403bb.zip
[Cleanup] Handle system dependent defines through autoheader & common-config.h
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2890 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/network')
-rw-r--r--common/network/Makefile.am2
-rw-r--r--common/network/TcpSocket.cxx8
2 files changed, 5 insertions, 5 deletions
diff --git a/common/network/Makefile.am b/common/network/Makefile.am
index 61d276bb..c4bad934 100644
--- a/common/network/Makefile.am
+++ b/common/network/Makefile.am
@@ -4,5 +4,5 @@ HDRS = Socket.h TcpSocket.h
libnetwork_la_SOURCES = $(HDRS) TcpSocket.cxx
-libnetwork_la_CPPFLAGS = -I$(top_srcdir) @SOCKLEN_T_DEFINE@
+libnetwork_la_CPPFLAGS = -I$(top_srcdir)
diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx
index 5dd24287..777627b4 100644
--- a/common/network/TcpSocket.cxx
+++ b/common/network/TcpSocket.cxx
@@ -16,6 +16,10 @@
* USA.
*/
+#ifdef HAVE_COMMON_CONFIG_H
+#include <common-config.h>
+#endif
+
#ifdef WIN32
//#include <io.h>
#include <winsock2.h>
@@ -42,10 +46,6 @@
#include <rfb/util.h>
#include <rfb/LogWriter.h>
-#ifndef VNC_SOCKLEN_T
-#define VNC_SOCKLEN_T int
-#endif
-
#ifndef INADDR_NONE
#define INADDR_NONE ((unsigned long)-1)
#endif