Merge branch 'development'

[NeonServV5.git] / src / mysqlConn.h

diff --git a/src/mysqlConn.h b/src/mysqlConn.h
index 19946bd5e515fb0a7eddb212c1fd7554b45548d1..e85832f6272796160ed84b5b4439d80fb10d9f18 100644 (file)
--- a/src/mysqlConn.h
+++ b/src/mysqlConn.h
@@ -1,5 +1,5 @@
-/* mysqlConn.h - NeonServ v5.3
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* mysqlConn.h - NeonServ v5.6
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,19 +19,23 @@
 
 #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
 
-extern MYSQL *mysql_conn;
-
-void check_mysql();
-MYSQL_RES *mysql_use();
-void mysql_free();
-void init_mysql(char *host, int port, char *user, char *pass, char *base);
+#ifndef DND_FUNCTIONS
+/* MODULAR ACCESSIBLE */ MYSQL_RES *mysql_use();
+/* MODULAR ACCESSIBLE */ void mysql_free();
+int reload_mysql();
+void init_mysql();
 void free_mysql();
-void show_mysql_error();
-void printf_mysql_query(const char *text, ...) PRINTF_LIKE(1, 2);
-char* escape_string(const char *str);
-
-#endif
\ No newline at end of file
+/* 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);
+/* MODULAR ACCESSIBLE */ char* escape_string(const char *str);
+/* MODULAR ACCESSIBLE */ MYSQL *get_mysql_conn();
+#endif
+#endif