diff options
| author | Adam Tkac <atkac@redhat.com> | 2008-03-22 11:20:54 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2008-03-22 11:20:54 +0000 |
| commit | fded0784456d6fb106d084d961ebbf5e4227c6a6 (patch) | |
| tree | 54ba7d062bc775e57c5b7050d3853abcb8ce0672 /common/zlib/zutil.h | |
| parent | 2b92f2f3b6f57dcc61a59d1fb2adf4ea46120705 (diff) | |
| download | tigervnc-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/zutil.h')
| -rw-r--r-- | common/zlib/zutil.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/common/zlib/zutil.h b/common/zlib/zutil.h index 82084988..17eb77f2 100644 --- a/common/zlib/zutil.h +++ b/common/zlib/zutil.h @@ -13,10 +13,6 @@ #ifndef _Z_UTIL_H #define _Z_UTIL_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "zlib.h" #ifdef STDC @@ -24,10 +20,10 @@ # include <string.h> # include <stdlib.h> #endif -#ifdef HAVE_ERRNO_H -# include <errno.h> -#else +#ifdef NO_ERRNO_H extern int errno; +#else +# include <errno.h> #endif #ifndef local |