From dd163e09b582177ce54fae44b63b10579ee0746d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 27 Dec 2009 23:09:19 +0100 Subject: fix make allmodconfig update several packages, remove snort-wireless. --- package/mysql/patches/patch-include_my_global_h | 59 ------------------------- 1 file changed, 59 deletions(-) delete mode 100644 package/mysql/patches/patch-include_my_global_h (limited to 'package/mysql/patches/patch-include_my_global_h') 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 0513e1ca4..000000000 --- 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 - #endif -+ - #if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA) - #undef HAVE_ALLOCA - #undef HAVE_ALLOCA_H - #endif --#ifdef HAVE_ALLOCA_H --#include -+ -+#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 --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 - #endif -+ - #include /* Recommended by debian */ - /* We need the following to go around a problem with openssl on solaris */ -+#ifdef BSD -+#include -+#include -+#else - #if defined(HAVE_CRYPT_H) - #include - #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 */ -- cgit v1.2.3