* Refixed the fix with a constant list for Win32 users - limits.h (imported from MSVC)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5769 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -6,12 +6,18 @@ GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALAR
 
 
 2006/03/26
+	* 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]
 	* Changed status_point/skill_point to unsigned short. Adjusted the code as
-	  necessary to prevent overflows. [Skotlex]
-	* itemdb_exists and itemdb_searchname should now ignore dummy_item matches. [Skotlex]
-	* Fixed jstrescapecpy crashing when you pass a null string to parse. [Skotlex]
+
+	  necessary to prevent overflows. [Skotlex]
+
+	* itemdb_exists and itemdb_searchname should now ignore dummy_item matches. [Skotlex]
+
+	* Fixed jstrescapecpy crashing when you pass a null string to parse. [Skotlex]
+
+
 2006/03/25
 	* Fixed the map-server freeze/crash on Warp Portal. [Skotlex]
 	* Fixed Grandcross/Granddarkness showing no skill animation. [Skotlex]

src/common/limits.h

@@ -0,0 +1,122 @@
+/***
+*limits.h - implementation dependent values
+*
+*       Copyright (c) Microsoft Corporation.  All rights reserved.
+*
+*Purpose:
+*       Contains defines for a number of implementation dependent values
+*       which are commonly used in C programs.
+*       [ANSI]
+*
+*       [Public]
+*
+****/
+
+#if     _MSC_VER > 1000
+#pragma once
+#endif
+
+#ifndef _INC_LIMITS
+#define _INC_LIMITS
+
+#if     defined(_WIN32)
+	#define CHAR_BIT      8         /* number of bits in a char */
+	#define SCHAR_MIN   (-128)      /* minimum signed char value */
+	#define SCHAR_MAX     127       /* maximum signed char value */
+	#define UCHAR_MAX     0xff      /* maximum unsigned char value */
+
+	#ifndef _CHAR_UNSIGNED
+	#define CHAR_MIN    SCHAR_MIN   /* mimimum char value */
+	#define CHAR_MAX    SCHAR_MAX   /* maximum char value */
+	#else
+	#define CHAR_MIN      0
+	#define CHAR_MAX    UCHAR_MAX
+	#endif  /* _CHAR_UNSIGNED */
+
+	#define MB_LEN_MAX    5             /* max. # bytes in multibyte char */
+	#define SHRT_MIN    (-32768)        /* minimum (signed) short value */
+	#define SHRT_MAX      32767         /* maximum (signed) short value */
+	#define USHRT_MAX     0xffff        /* maximum unsigned short value */
+	#define INT_MIN     (-2147483647 - 1) /* minimum (signed) int value */
+	#define INT_MAX       2147483647    /* maximum (signed) int value */
+	#define UINT_MAX      0xffffffff    /* maximum unsigned int value */
+	#define LONG_MIN    (-2147483647L - 1) /* minimum (signed) long value */
+	#define LONG_MAX      2147483647L   /* maximum (signed) long value */
+	#define ULONG_MAX     0xffffffffUL  /* maximum unsigned long value */
+
+	/* Make sure these macros don't show up in ANSI C++ code */
+	#if !defined(__cplusplus) || defined(_MSC_EXTENSIONS)
+	#define LLONG_MAX     0x7fffffffffffffff  /*maximum signed __int64 value */
+	#define LLONG_MIN     0x8000000000000000  /*minimum signed __int64 value */
+	#define ULLONG_MAX    0xffffffffffffffff  /*maximum unsigned __int64 value */
+	#endif
+
+	#if     _INTEGRAL_MAX_BITS >= 8
+	#define _I8_MIN     (-127i8 - 1)    /* minimum signed 8 bit value */
+	#define _I8_MAX       127i8         /* maximum signed 8 bit value */
+	#define _UI8_MAX      0xffui8       /* maximum unsigned 8 bit value */
+	#endif
+
+	#if     _INTEGRAL_MAX_BITS >= 16
+	#define _I16_MIN    (-32767i16 - 1) /* minimum signed 16 bit value */
+	#define _I16_MAX      32767i16      /* maximum signed 16 bit value */
+	#define _UI16_MAX     0xffffui16    /* maximum unsigned 16 bit value */
+	#endif
+
+	#if     _INTEGRAL_MAX_BITS >= 32
+	#define _I32_MIN    (-2147483647i32 - 1) /* minimum signed 32 bit value */
+	#define _I32_MAX      2147483647i32 /* maximum signed 32 bit value */
+	#define _UI32_MAX     0xffffffffui32 /* maximum unsigned 32 bit value */
+	#endif
+
+	#if     _INTEGRAL_MAX_BITS >= 64
+	/* minimum signed 64 bit value */
+	#define _I64_MIN    (-9223372036854775807i64 - 1)
+	/* maximum signed 64 bit value */
+	#define _I64_MAX      9223372036854775807i64
+	/* maximum unsigned 64 bit value */
+	#define _UI64_MAX     0xffffffffffffffffui64
+	#endif
+
+	#if     _INTEGRAL_MAX_BITS >= 128
+	/* minimum signed 128 bit value */
+	#define _I128_MIN   (-170141183460469231731687303715884105727i128 - 1)
+	/* maximum signed 128 bit value */
+	#define _I128_MAX     170141183460469231731687303715884105727i128
+	/* maximum unsigned 128 bit value */
+	#define _UI128_MAX    0xffffffffffffffffffffffffffffffffui128
+	#endif
+
+	#ifdef  _POSIX_
+
+	#define _POSIX_ARG_MAX      4096
+	#define _POSIX_CHILD_MAX    6
+	#define _POSIX_LINK_MAX     8
+	#define _POSIX_MAX_CANON    255
+	#define _POSIX_MAX_INPUT    255
+	#define _POSIX_NAME_MAX     14
+	#define _POSIX_NGROUPS_MAX  0
+	#define _POSIX_OPEN_MAX     16
+	#define _POSIX_PATH_MAX     255
+	#define _POSIX_PIPE_BUF     512
+	#define _POSIX_SSIZE_MAX    32767
+	#define _POSIX_STREAM_MAX   8
+	#define _POSIX_TZNAME_MAX   3
+
+	#define ARG_MAX             14500       /* 16k heap, minus overhead */
+	#define LINK_MAX            1024
+	#define MAX_CANON           _POSIX_MAX_CANON
+	#define MAX_INPUT           _POSIX_MAX_INPUT
+	#define NAME_MAX            255
+	#define NGROUPS_MAX         16
+	#define OPEN_MAX            32
+	#define PATH_MAX            512
+	#define PIPE_BUF            _POSIX_PIPE_BUF
+	#define SSIZE_MAX           _POSIX_SSIZE_MAX
+	#define STREAM_MAX          20
+	#define TZNAME_MAX          10
+
+	#endif  /* POSIX */
+
+	#endif  /* _INC_LIMITS */
+#endif

src/map/atcommand.c

@@ -13,6 +13,7 @@
 #include "../common/mmo.h"
 #include "../common/core.h"
 #include "../common/showmsg.h"
+#include "../common/limits.h"
 
 #include "log.h"
 #include "clif.h"

src/map/charcommand.c

@@ -10,6 +10,7 @@
 #include "../common/socket.h"
 #include "../common/timer.h"
 #include "../common/nullpo.h"
+#include "../common/limits.h"
 
 #include "log.h"
 #include "clif.h"

src/map/chrif.c

@@ -14,6 +14,7 @@
 #endif
 #include <sys/types.h>
 #include <time.h>
+#include "../common/limits.h"
 
 #include "../common/malloc.h"
 #include "socket.h"
@@ -35,10 +36,6 @@
 //Used Packets: U->2af8
 //Free Packets: F->2af8
 
-#ifndef USHRT_MAX
-	#define USHRT_MAX 65535
-#endif
-
 struct dbt *auth_db;
 
 static const int packet_len_table[0x3d] = {

src/map/clif.c

@@ -27,6 +27,7 @@
 #include "../common/version.h"
 #include "../common/nullpo.h"
 #include "../common/showmsg.h"
+#include "../common/limits.h"
 
 #include "map.h"
 #include "chrif.h"

vcproj-7.1/map-server_sql.vcproj

@@ -339,6 +339,9 @@
 			<File
 				RelativePath="..\src\map\itemdb.h">
 			</File>
+			<File
+				RelativePath="..\src\common\limits.h">
+			</File>
 			<File
 				RelativePath="..\src\common\lock.h">
 			</File>

vcproj-7.1/map-server_txt.vcproj

@@ -340,6 +340,9 @@
 			<File
 				RelativePath="..\src\map\itemdb.h">
 			</File>
+			<File
+				RelativePath="..\src\common\limits.h">
+			</File>
 			<File
 				RelativePath="..\src\common\lock.h">
 			</File>