Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper"

include/my_libwrap.h

@@ -14,6 +14,15 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#ifdef HAVE_LIBWRAP
+#include <tcpd.h>
+#include <syslog.h>
+#ifdef NEED_SYS_SYSLOG_H
+#include <sys/syslog.h>
+#endif /* NEED_SYS_SYSLOG_H */
+
 extern void my_fromhost(struct request_info *req);
 extern int my_hosts_access(struct request_info *req);
 extern char *my_eval_client(struct request_info *req);
+
+#endif /* HAVE_LIBWRAP */

mysys/my_libwrap.c

@@ -14,14 +14,15 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+/* 
+  This is needed to be able to compile with original libwrap header
+  files that don't have the prototypes
+*/
+
 #include <my_global.h>
+#include <my_libwrap.h>
+
 #ifdef HAVE_LIBWRAP
-#include <tcpd.h>
-#include <syslog.h>
-#ifdef NEED_SYS_SYSLOG_H
-#include <sys/syslog.h>
-#endif /* NEED_SYS_SYSLOG_H */
-#endif
 
 void my_fromhost(struct request_info *req)
 {
@@ -37,3 +38,5 @@ char *my_eval_client(struct request_info *req)
 {
   eval_client(req);
 }
+
+#endif /* HAVE_LIBWRAP */

sql/mysqld.cc

@@ -120,16 +120,7 @@ extern "C" {					// Because of SCO 3.2V4.2
 #include <sys/utsname.h>
 #endif /* __WIN__ */
 
-#ifdef HAVE_LIBWRAP
-#include <tcpd.h>
-#include <syslog.h>
-#ifdef NEED_SYS_SYSLOG_H
-#include <sys/syslog.h>
-#endif /* NEED_SYS_SYSLOG_H */
-int allow_severity = LOG_INFO;
-int deny_severity = LOG_WARNING;
-
-#endif /* HAVE_LIBWRAP */
+#include <my_libwrap.h>
 
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
@@ -591,6 +582,8 @@ static const char* default_dbug_option;
 #endif
 #ifdef HAVE_LIBWRAP
 const char *libwrapName= NULL;
+int allow_severity = LOG_INFO;
+int deny_severity = LOG_WARNING;
 #endif
 #ifdef HAVE_QUERY_CACHE
 static ulong query_cache_limit= 0;