aboutsummaryrefslogtreecommitdiffstats
path: root/common/zlib/zconf.h
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2008-03-22 11:20:54 +0000
committerAdam Tkac <atkac@redhat.com>2008-03-22 11:20:54 +0000
commitfded0784456d6fb106d084d961ebbf5e4227c6a6 (patch)
tree54ba7d062bc775e57c5b7050d3853abcb8ce0672 /common/zlib/zconf.h
parent2b92f2f3b6f57dcc61a59d1fb2adf4ea46120705 (diff)
downloadtigervnc-fded0784456d6fb106d084d961ebbf5e4227c6a6.tar.gz
tigervnc-fded0784456d6fb106d084d961ebbf5e4227c6a6.zip
After discussion with Constantin reverted 2433, 2434, 2436, 2437 and 2438
(build automation and i18n changes). Latest server changes (2439 and 2440) are OK. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2442 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/zlib/zconf.h')
-rw-r--r--common/zlib/zconf.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/common/zlib/zconf.h b/common/zlib/zconf.h
index d1705ae1..c8d6ce9a 100644
--- a/common/zlib/zconf.h
+++ b/common/zlib/zconf.h
@@ -8,10 +8,6 @@
#ifndef _ZCONF_H
#define _ZCONF_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/*
* If you *really* need a unique prefix for all types and library functions,
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.