summaryrefslogtreecommitdiffstats
path: root/common/zlib/zutil.h
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2008-03-27 18:13:28 +0000
committerAdam Tkac <atkac@redhat.com>2008-03-27 18:13:28 +0000
commita6d64cbe54bcede737ed1ea3004d6926ec849be9 (patch)
tree59e69431d577028c76c144bc5e92e9e5a416886f /common/zlib/zutil.h
parent0b7901f76addfd9d812db596deb56b572f6d5362 (diff)
downloadtigervnc-a6d64cbe54bcede737ed1ea3004d6926ec849be9.tar.gz
tigervnc-a6d64cbe54bcede737ed1ea3004d6926ec849be9.zip
Introduced common/zlib/{configure.ac,Makefile.am}. Renamed macros
generated by old configure to same as generated by new configure and add config.h include where needed. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2454 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/zlib/zutil.h')
-rw-r--r--common/zlib/zutil.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/common/zlib/zutil.h b/common/zlib/zutil.h
index 17eb77f2..82084988 100644
--- a/common/zlib/zutil.h
+++ b/common/zlib/zutil.h
@@ -13,6 +13,10 @@
#ifndef _Z_UTIL_H
#define _Z_UTIL_H
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "zlib.h"
#ifdef STDC
@@ -20,10 +24,10 @@
# include <string.h>
# include <stdlib.h>
#endif
-#ifdef NO_ERRNO_H
- extern int errno;
-#else
+#ifdef HAVE_ERRNO_H
# include <errno.h>
+#else
+ extern int errno;
#endif
#ifndef local