summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure.ac28
-rw-r--r--src/net/protocol.h4
3 files changed, 22 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index f1b52bc4..1a4b313c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-01 Bjørn Lindeijer <bjorn@lindeijer.nl>
+
+ * configure.ac: Moved some basic checks above the checks on the
+ libraries we depend on, in order to get rid of the confusing
+ rpl_realloc error.
+
2006-08-01 Eugenio Favalli <elvenprogrammer@gmail.com>
* src/gui/gui.cpp, The Mana World.dev, tmw.cbp: Fixed compilation
diff --git a/configure.ac b/configure.ac
index ce30607f..d8f980d3 100755
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,20 @@ AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_MAKE_SET
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_HEADER_TIME
+AC_C_VOLATILE
+
+# Checks for library functions.
+AC_FUNC_ERROR_AT_LINE
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_FUNC_SELECT_ARGTYPES
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([atexit floor getcwd gethostbyname memset mkdir select socket])
+
# Checks for libraries
AC_CHECK_LIB([pthread], [pthread_create], ,
AC_MSG_ERROR([ *** Unable to find pthread library ]))
@@ -57,20 +71,6 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h str
AC_CHECK_HEADERS([guichan.hpp], ,
AC_MSG_ERROR([*** Library found but cannot find headers (guichan.sf.net) *** ]))
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_HEADER_TIME
-AC_C_VOLATILE
-
-# Checks for library functions.
-AC_FUNC_ERROR_AT_LINE
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_FUNC_SELECT_ARGTYPES
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([atexit floor getcwd gethostbyname memset mkdir select socket])
-
AM_INIT_AUTOMAKE
# Option to enable OpenGL
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 0db4dfb0..e1d403a2 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -116,11 +116,11 @@
*/
enum {
// Login/Register
- PAMSG_REGISTER = 0x0000, // S version, S username, S password, S email
+ PAMSG_REGISTER = 0x0000, // L version, S username, S password, S email
APMSG_REGISTER_RESPONSE = 0x0002, // B error
PAMSG_UNREGISTER = 0x0003, // -
APMSG_UNREGISTER_RESPONSE = 0x0004, // B error
- PAMSG_LOGIN = 0x0010, // S version, S username, S password
+ PAMSG_LOGIN = 0x0010, // L version, S username, S password
APMSG_LOGIN_RESPONSE = 0x0012, // B error
PAMSG_LOGOUT = 0x0013, // -
APMSG_LOGOUT_RESPONSE = 0x0014, // B error