Commit 16d50ca4 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

merge

parent 72537f31
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ subdirectory of 'mysql'. */
/* Include the header file generated by GNU autoconf */
#include "../ib_config.h"

#undef UNIV_INTEL_X86	/* Temporary fix for gcc 2.96 */

#ifdef HAVE_SCHED_H
#include <sched.h>
#endif