Changelog
Michael Stefaniuc <mstefani@redhat.com>
replaced MAX with max and deleted definition of MAX
--
Michael Stefaniuc Tel.: +49-711-96437-199
System Administration Fax.: +49-711-96437-111
Red Hat GmbH Email: mstefani@redhat.de
Hauptstaetterstr. 58 http://www.redhat.de/
D-70178 Stuttgart
Index: tools/wrc/wrc.h
===================================================================
RCS file: /home/wine/wine/tools/wrc/wrc.h,v
retrieving revision 1.21
diff -u -r1.21 wrc.h
--- tools/wrc/wrc.h 2001/01/02 20:46:28 1.21
+++ tools/wrc/wrc.h 2001/12/18 20:59:06
@@ -25,10 +25,6 @@
#define WRC_VERSION WRC_VERSIONIZE(WRC_MAJOR_VERSION, WRC_MINOR_VERSION, WRC_MICRO_VERSION)
#define WRC_FULLVERSION WRC_VERSION " " WRC_RELEASEDATE
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
/* From wrc.c */
extern int debuglevel;
#define DEBUGLEVEL_NONE 0x0000
Index: tools/wrc/ppl.l
===================================================================
RCS file: /home/wine/wine/tools/wrc/ppl.l,v
retrieving revision 1.6
diff -u -r1.6 ppl.l
--- tools/wrc/ppl.l 2001/11/06 20:57:26 1.6
+++ tools/wrc/ppl.l 2001/12/18 21:04:00
@@ -1333,7 +1333,7 @@
if(mep->curargalloc - mep->curargsize <= len+1) /* +1 for '\0' */
{
- mep->curargalloc += MAX(ALLOCBLOCKSIZE, len+1);
+ mep->curargalloc += max(ALLOCBLOCKSIZE, len+1);
mep->curarg = xrealloc(mep->curarg, mep->curargalloc * sizeof(mep->curarg[0]));
}
memcpy(mep->curarg + mep->curargsize, text, len);
