Bug#18790490: NOISY COMPILER WARNINGS ON FREEBSD 10

jhauglid · jhauglid · commit 88222e220bd7 · 2014-09-09T16:40:01.000+02:00
Fix the following two header file compile warnings by backporting
changes from mysql-trunk:
/usr/include/sys/timeb.h:42:2: error: "this file includes &lt;sys/timeb.h&gt; which is deprecated"
dict0dict.h:85:1: error: attribute declaration must precede definition
diff --git a/include/my_global.h b/include/my_global.h
@@ -333,9 +333,6 @@ C_MODE_END
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#ifdef HAVE_SYS_TIMEB_H
-#include <sys/timeb.h>				/* Avoid warnings on SCO */
-#endif
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h
@@ -82,7 +82,7 @@ dict_get_referenced_table(
 	mem_heap_t*	heap);		/*!< in: heap memory */
 /*********************************************************************//**
 Frees a foreign key struct. */
-UNIV_INTERN
+
 void
 dict_foreign_free(
 /*==============*/
