diff options
| author | unknown <pekka@mysql.com> | 2005-03-28 23:06:19 +0200 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2005-03-28 23:06:19 +0200 |
| commit | 4884bb8e419c9d197d0620f2ad8e2c57d16dcaf2 (patch) | |
| tree | e6080a4ea78a3fdff6cf8095ab0d0d77de2e3120 /zlib/zutil.h | |
| parent | 28f847996f3b334e09a5096fa6c17f6511c84b14 (diff) | |
| parent | 3eae222640a1b0b3824bbf992146624672b8d492 (diff) | |
| download | mariadb-git-4884bb8e419c9d197d0620f2ad8e2c57d16dcaf2.tar.gz | |
Merge
client/mysqltest.c:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/metadata.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/type_enum.result:
Auto merged
mysql-test/t/grant2.test:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
SCCS merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
SCCS merged
sql/sql_union.cc:
DBUG_ASSERT(TRUE) is useless so assume opposite
Diffstat (limited to 'zlib/zutil.h')
| -rw-r--r-- | zlib/zutil.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/zlib/zutil.h b/zlib/zutil.h index 87b70acec23..7b42edcaa98 100644 --- a/zlib/zutil.h +++ b/zlib/zutil.h @@ -189,9 +189,14 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define NO_vsnprintf # endif #endif +#ifdef VMS +# define NO_vsnprintf +#endif #ifdef HAVE_STRERROR - extern char *strerror OF((int)); +# ifndef VMS + extern char *strerror OF((int)); +# endif # define zstrerror(errnum) strerror(errnum) #else # define zstrerror(errnum) "" |