projects
/
NeonServV5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
47821a9
)
fixed path of mysql/errmsg.h (OSX compilation fix)
author
pk910
<philipp@zoelle1.de>
Sat, 22 Sep 2012 05:12:08 +0000
(07:12 +0200)
committer
pk910
<philipp@zoelle1.de>
Sat, 22 Sep 2012 05:12:08 +0000
(07:12 +0200)
configure.ac
patch
|
blob
|
history
src/mysqlConn.h
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index 17de99d6d3d884f542f767547a524ce4de7c6e35..409d0a2b0312327419da2541f8faba7f5a818cd4 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-76,7
+76,7
@@
AC_ARG_ENABLE([debug],
CFLAGS="$CFLAGS -D_GNU_SOURCE"
# Checks for header files.
CFLAGS="$CFLAGS -D_GNU_SOURCE"
# Checks for header files.
-AC_CHECK_HEADERS([stdio.h stdlib.h string.h ctype.h windows.h winsock2.h malloc.h features.h sys/types.h sys/socket.h netinet/in.h netinet/tcp.h arpa/inet.h netdb.h sys/wait.h errno.h unistd.h getopt.h stdarg.h sys/time.h time.h signal.h sys/epoll.h sys/event.h ws2tcpip.h mysql.h mysql/errmsg.h])
+AC_CHECK_HEADERS([stdio.h stdlib.h string.h ctype.h windows.h winsock2.h malloc.h features.h sys/types.h sys/socket.h netinet/in.h netinet/tcp.h arpa/inet.h netdb.h sys/wait.h errno.h unistd.h getopt.h stdarg.h sys/time.h time.h signal.h sys/epoll.h sys/event.h ws2tcpip.h mysql.h mysql/errmsg.h
errmsg.h
])
# Checks for typedefs, structures, and compiler characteristics.
# Checks for typedefs, structures, and compiler characteristics.
diff --git
a/src/mysqlConn.h
b/src/mysqlConn.h
index e0ebfc781dbe2637ad28fc085beb425d01c369ea..660e2cb32c2c74f8c5ef817d9af97f19f71dcc6d 100644
(file)
--- a/
src/mysqlConn.h
+++ b/
src/mysqlConn.h
@@
-21,6
+21,8
@@
#include <mysql.h>
#ifdef HAVE_MYSQL_ERRMSG_H
#include <mysql/errmsg.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
#endif
#define MYSQLMAXLEN 1024