diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/common/malloc.h | 2 | ||||
| -rw-r--r-- | src/map/atcommand.c | 1 | ||||
| -rw-r--r-- | src/map/charcommand.c | 1 | ||||
| -rw-r--r-- | src/map/chrif.c | 1 | ||||
| -rw-r--r-- | src/map/clif.c | 1 |
6 files changed, 3 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 11cb5985b..9e0f1d9dd 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -6,6 +6,7 @@ GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALAR 2006/03/26
+ * GCC on Cygwin still complaining, resorted to including limits.h in malloc.h [Lance]
* Refixed the fix with a constant list for Win32 users - limits.h (imported from MSVC) [Lance]
* Fixed a problem in chrif.c where USHRT_MAX was undefined. [Codemaster]
* Added jAthena's new start and athena-start shell scripts. [Lance]
diff --git a/src/common/malloc.h b/src/common/malloc.h index e9dbb9d44..d6c6e50c4 100644 --- a/src/common/malloc.h +++ b/src/common/malloc.h @@ -15,6 +15,8 @@ #endif
#define ALC_MARK __FILE__, __LINE__, __func__
+#include "limits.h"
+
//////////////////////////////////////////////////////////////////////
// Whether to use Athena's built-in Memory Manager (enabled by default)
// To disable just comment the following line
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 4f1776d62..9d4bbe155 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -13,7 +13,6 @@ #include "../common/mmo.h"
#include "../common/core.h"
#include "../common/showmsg.h"
-#include "../common/limits.h"
#include "log.h"
#include "clif.h"
diff --git a/src/map/charcommand.c b/src/map/charcommand.c index 4e9b8b542..27e92029a 100644 --- a/src/map/charcommand.c +++ b/src/map/charcommand.c @@ -10,7 +10,6 @@ #include "../common/socket.h"
#include "../common/timer.h"
#include "../common/nullpo.h"
-#include "../common/limits.h"
#include "log.h"
#include "clif.h"
diff --git a/src/map/chrif.c b/src/map/chrif.c index 33fb309ac..3a11222fb 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -14,7 +14,6 @@ #endif
#include <sys/types.h>
#include <time.h>
-#include "../common/limits.h"
#include "../common/malloc.h"
#include "socket.h"
diff --git a/src/map/clif.c b/src/map/clif.c index 2e8d34c46..1e7f6baa9 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -27,7 +27,6 @@ #include "../common/version.h"
#include "../common/nullpo.h"
#include "../common/showmsg.h"
-#include "../common/limits.h"
#include "map.h"
#include "chrif.h"
|