Replaced MAX with max and deleted definition of MAX.
This commit is contained in:
parent
3bc5ffd3c6
commit
690d24f28e
|
@ -1333,7 +1333,7 @@ static void add_text_to_macro(char *text, int len)
|
||||||
|
|
||||||
if(mep->curargalloc - mep->curargsize <= len+1) /* +1 for '\0' */
|
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]));
|
mep->curarg = xrealloc(mep->curarg, mep->curargalloc * sizeof(mep->curarg[0]));
|
||||||
}
|
}
|
||||||
memcpy(mep->curarg + mep->curargsize, text, len);
|
memcpy(mep->curarg + mep->curargsize, text, len);
|
||||||
|
|
|
@ -25,10 +25,6 @@
|
||||||
#define WRC_VERSION WRC_VERSIONIZE(WRC_MAJOR_VERSION, WRC_MINOR_VERSION, WRC_MICRO_VERSION)
|
#define WRC_VERSION WRC_VERSIONIZE(WRC_MAJOR_VERSION, WRC_MINOR_VERSION, WRC_MICRO_VERSION)
|
||||||
#define WRC_FULLVERSION WRC_VERSION " " WRC_RELEASEDATE
|
#define WRC_FULLVERSION WRC_VERSION " " WRC_RELEASEDATE
|
||||||
|
|
||||||
#ifndef MAX
|
|
||||||
#define MAX(a,b) ((a) > (b) ? (a) : (b))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* From wrc.c */
|
/* From wrc.c */
|
||||||
extern int debuglevel;
|
extern int debuglevel;
|
||||||
#define DEBUGLEVEL_NONE 0x0000
|
#define DEBUGLEVEL_NONE 0x0000
|
||||||
|
|
Loading…
Reference in New Issue