summaryrefslogtreecommitdiff
path: root/package/mysql/patches/patch-include_my_global_h
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-27 22:09:19 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-27 22:09:19 (GMT)
commitdd163e09b582177ce54fae44b63b10579ee0746d (patch)
tree80f6341bacc9e62a274231157ec35a5b262f5e24 /package/mysql/patches/patch-include_my_global_h
parent537a2c4eaa446e52c6ba07007eb9ae75998b5580 (diff)
fix make allmodconfig
update several packages, remove snort-wireless.
Diffstat (limited to 'package/mysql/patches/patch-include_my_global_h')
-rw-r--r--package/mysql/patches/patch-include_my_global_h59
1 files changed, 0 insertions, 59 deletions
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h
deleted file mode 100644
index 0513e1c..0000000
--- a/package/mysql/patches/patch-include_my_global_h
+++ /dev/null
@@ -1,59 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- mysql-5.0.85.orig/include/my_global.h 2009-08-11 12:50:17.000000000 +0200
-+++ mysql-5.0.85/include/my_global.h 2009-08-27 22:21:39.363259500 +0200
-@@ -350,29 +350,32 @@ C_MODE_END
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+
- #if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA)
- #undef HAVE_ALLOCA
- #undef HAVE_ALLOCA_H
- #endif
--#ifdef HAVE_ALLOCA_H
--#include <alloca.h>
-+
-+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
-+#ifndef BSD
-+#define BSD
- #endif
--#ifdef HAVE_ATOMIC_ADD
--#define new my_arg_new
--#define need_to_restore_new 1
--C_MODE_START
--#include <asm/atomic.h>
--C_MODE_END
--#ifdef need_to_restore_new /* probably safer than #ifdef new */
--#undef new
--#undef need_to_restore_new
- #endif
-+
-+#if defined(HAVE_ALLOCA_H) && !defined(BSD)
-+#include <alloca.h>
- #endif
-+
- #include <errno.h> /* Recommended by debian */
- /* We need the following to go around a problem with openssl on solaris */
-+#ifdef BSD
-+#include <pwd.h>
-+#include <unistd.h>
-+#else
- #if defined(HAVE_CRYPT_H)
- #include <crypt.h>
- #endif
-+#endif
-
- /*
- A lot of our programs uses asserts, so better to always include it
-@@ -791,9 +794,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
- #define finite(x) (1.0 / fabs(x) > 0.0)
- #endif
-
-+/*
- #ifndef HAVE_ISNAN
- #define isnan(x) ((x) != (x))
- #endif
-+*/
-
- #ifdef HAVE_ISINF
- /* Check if C compiler is affected by GCC bug #39228 */