9301fefeac
Copy from server:database/mariadb based on submit request 39217 from user -miska- OBS-URL: https://build.opensuse.org/request/show/39217 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=1
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
diff -Naru mysql-5.1.44-bak/include/mysql.h mysql-5.1.44/include/mysql.h
|
|
--- mysql-5.1.44-bak/include/mysql.h 2010-02-23 00:31:19.000000000 +0100
|
|
+++ mysql-5.1.44/include/mysql.h 2010-02-23 10:51:49.000000000 +0100
|
|
@@ -44,7 +44,9 @@
|
|
#endif
|
|
|
|
#ifndef _global_h /* If not standard header */
|
|
-#include <sys/types.h>
|
|
+#ifndef _abi_test_
|
|
+#include <sys/types.h>
|
|
+#endif
|
|
#ifdef __LCC__
|
|
#include <winsock2.h> /* For windows */
|
|
#endif
|
|
diff -Naru mysql-5.1.44-bak/include/mysql.h.pp mysql-5.1.44/include/mysql.h.pp
|
|
--- mysql-5.1.44-bak/include/mysql.h.pp 2010-02-23 00:31:19.000000000 +0100
|
|
+++ mysql-5.1.44/include/mysql.h.pp 2010-02-23 10:54:46.000000000 +0100
|
|
@@ -1,4 +1,3 @@
|
|
-#include <sys/types.h>
|
|
typedef char my_bool;
|
|
typedef int my_socket;
|
|
#include "mysql_version.h"
|
|
diff -Naru mysql-5.1.44-bak/Makefile.am mysql-5.1.44/Makefile.am
|
|
--- mysql-5.1.44-bak/Makefile.am 2010-02-23 00:31:18.000000000 +0100
|
|
+++ mysql-5.1.44/Makefile.am 2010-02-23 10:50:18.000000000 +0100
|
|
@@ -321,7 +321,8 @@
|
|
-I$(top_builddir)/include \
|
|
-I$(top_builddir)/include/mysql \
|
|
-I$(top_builddir)/sql \
|
|
- $$file 2>/dev/null | \
|
|
+ -D_abi_test_ \
|
|
+ $$file | \
|
|
@SED@ -e '/^# /d' \
|
|
-e '/^[ ]*$$/d' \
|
|
-e '/^#pragma GCC set_debug_pwd/d' \
|