Update for src/util/fairland.c:1.25 and include/prototypes.h:1.84

This commit is contained in:
Marc Olzheim 2005-06-15 12:55:21 +00:00
parent e1ecf7bd86
commit e6a7d4a694

View file

@ -17,9 +17,9 @@ Index: empserver/include/damage.h
#endif /* _DAMAGE_H_ */ #endif /* _DAMAGE_H_ */
Index: empserver/include/prototypes.h Index: empserver/include/prototypes.h
--- empserver/include/prototypes.h 26 May 2005 01:58:48 -0000 1.75 --- empserver/include/prototypes.h 26 May 2005 01:58:48 -0000 1.84
+++ empserver/include/prototypes.h 28 May 2005 08:32:39 -0000 +++ empserver/include/prototypes.h 28 May 2005 08:32:39 -0000
@@ -394,6 +394,9 @@ @@ -392,6 +392,9 @@
#ifdef NOSTRDUP #ifdef NOSTRDUP
extern char *strdup(char *x); extern char *strdup(char *x);
#endif #endif
@ -433,9 +433,9 @@ Index: empserver/src/server/update.c
delta += wind; delta += wind;
} }
Index: empserver/src/util/fairland.c Index: empserver/src/util/fairland.c
--- empserver/src/util/fairland.c 16 Mar 2005 22:03:16 -0000 1.23 --- empserver/src/util/fairland.c 16 Mar 2005 22:03:16 -0000 1.25
+++ empserver/src/util/fairland.c 17 Mar 2005 10:01:15 -0000 +++ empserver/src/util/fairland.c 17 Mar 2005 10:01:15 -0000
@@ -124,7 +124,7 @@ @@ -126,7 +126,7 @@
#if !defined(_WIN32) #if !defined(_WIN32)
#define max(a,b) (a>b?a:b) #define max(a,b) (a>b?a:b)
#endif #endif