diff options
| author | unknown <joerg@mysql.com> | 2005-03-07 10:27:20 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-03-07 10:27:20 +0100 |
| commit | 25ca5723412ffe912e8c1f82aceb601ef0b1c608 (patch) | |
| tree | 2984247f42edd9aceb96e8e6d166ce7c6685592b /include/my_sys.h | |
| parent | ae81d53048643da4b110c936eaec0a895af06219 (diff) | |
| parent | 32773212f543a9f28c2b0b2354476078fa46cd14 (diff) | |
| download | mariadb-git-25ca5723412ffe912e8c1f82aceb601ef0b1c608.tar.gz | |
Manual merge of the 4.0.24 compile changes into the 4.1 tree.
include/my_sys.h:
Auto merged
mysys/hash.c:
Manually merged: 'static' for all, 'inline' for most platforms.
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 79c7c8bd3c0..0161c198889 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -189,11 +189,13 @@ void __CDECL hfree(void *ptr); #endif #endif /* MSDOS */ +#ifndef errno /* did we already get it? */ #ifdef HAVE_ERRNO_AS_DEFINE #include <errno.h> /* errno is a define */ #else extern int errno; /* declare errno */ #endif +#endif /* #ifndef errno */ extern const char ** NEAR my_errmsg[]; extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE]; extern char *home_dir; /* Home directory for user */ |