Merge branch 'development'

[NeonServV5.git] / src / mysqlConn.h

diff --git a/src/mysqlConn.h b/src/mysqlConn.h
index 501147a9554fdc429161d3d0fe098f5298ba8b48..e85832f6272796160ed84b5b4439d80fb10d9f18 100644 (file)
--- a/src/mysqlConn.h
+++ b/src/mysqlConn.h
@@ -1,4 +1,4 @@
-/* mysqlConn.h - NeonServ v5.5
+/* mysqlConn.h - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -19,14 +19,19 @@
 
 #include "main.h"
 #include <mysql.h>
+#ifdef HAVE_MYSQL_ERRMSG_H
 #include <mysql/errmsg.h>
+#elif defined(HAVE_ERRMSG_H)
+#include <errmsg.h>
+#endif
 
 #define MYSQLMAXLEN 1024
 
 #ifndef DND_FUNCTIONS
 /* MODULAR ACCESSIBLE */ MYSQL_RES *mysql_use();
 /* MODULAR ACCESSIBLE */ void mysql_free();
-void init_mysql(char *host, int port, char *user, char *pass, char *base);
+int reload_mysql();
+void init_mysql();
 void free_mysql();
 /* MODULAR ACCESSIBLE */ void printf_mysql_query(const char *text, ...) PRINTF_LIKE(1, 2);
 /* MODULAR ACCESSIBLE */ void printf_long_mysql_query(int len, const char *text, ...) PRINTF_LIKE(2, 3);