current/SOURCES/mariadb-5.5-errno.patch

"extern int errno" is just a really bad idea.


diff -Naur 5.5_orig/include/my_sys.h 5.5/include/my_sys.h
--- 5.5_orig/include/my_sys.h   2011-11-01 16:20:49.000000000 +0100
+++ 5.5/include/my_sys.h        2011-11-04 17:37:10.096474305 +0100
@@ -196,13 +196,8 @@
 #define my_safe_alloca(size, min_length) ((size <= min_length) ? my_alloca(size) : my_malloc(size,MYF(MY_FAE)))
 #define my_safe_afree(ptr, size, min_length) ((size <= min_length) ? (void)0 : my_free(ptr))
 
-#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 char *home_dir;                 /* Home directory for user */
 extern const char *my_progname;                /* program-name (printed in errors) */
 extern const char *my_progname_short;  /* like above but without directory */
1	"extern int errno" is just a really bad idea.
2
3
4	diff -Naur 5.5_orig/include/my_sys.h 5.5/include/my_sys.h
5	--- 5.5_orig/include/my_sys.h 2011-11-01 16:20:49.000000000 +0100
6	+++ 5.5/include/my_sys.h 2011-11-04 17:37:10.096474305 +0100
7	@@ -196,13 +196,8 @@
8	#define my_safe_alloca(size, min_length) ((size <= min_length) ? my_alloca(size) : my_malloc(size,MYF(MY_FAE)))
9	#define my_safe_afree(ptr, size, min_length) ((size <= min_length) ? (void)0 : my_free(ptr))
10
11	-#ifndef errno /* did we already get it? */
12	-#ifdef HAVE_ERRNO_AS_DEFINE
13	#include <errno.h> /* errno is a define */
14	-#else
15	-extern int errno; /* declare errno */
16	-#endif
17	-#endif /* #ifndef errno */
18	+
19	extern char home_dir; / Home directory for user */
20	extern const char my_progname; / program-name (printed in errors) */
21	extern const char my_progname_short; / like above but without directory */