{min,max,abs} -> {MIN,MAX,ABS}

diff --git a/dfa.c b/dfa.c
index 0293e3c66e1870fbfbf460a1ea6a16d18a43532a..5d4c45fcac84c635f0a4438e92f7badb7f078ecb 100644 (file)
--- a/dfa.c
+++ b/dfa.c
@@ -204,7 +204,7 @@ int state[];
 
        for ( i = 0; i < csize; ++i )
                {
-               ec = abs( ecgroup[i] );
+               ec = ABS( ecgroup[i] );
                out_char_set[i] = state[ec];
                }
 
@@ -978,7 +978,7 @@ int ds[], dsize, transsym, nset[];
                        { /* do nothing */
                        }
 
-               else if ( abs( ecgroup[sym] ) == transsym )
+               else if ( ABS( ecgroup[sym] ) == transsym )
                        nset[++numstates] = tsp;
 
                bottom: ;

diff --git a/ecs.c b/ecs.c
index cc4e95500efbcef785cba564741e406423b4cdd9..4c3b9500cf45cb269b35cb267d13b3387b47a829 100644 (file)
--- a/ecs.c
+++ b/ecs.c
@@ -80,7 +80,7 @@ int fwd[], bck[], num;
 
        numcl = 0;
 
-       /* Create equivalence class numbers.  From now on, abs( bck(x) )
+       /* Create equivalence class numbers.  From now on, ABS( bck(x) )
         * is the equivalence class number for object x.  If bck(x)
         * is positive, then x is the representative of its equivalence
         * class.

diff --git a/flexdef.h b/flexdef.h
index bea7aa557d6ba673a8af0eda6dfa8311378e8567..74f075b48d5e4b473b8d4957d9c7d1f160262638 100644 (file)
--- a/flexdef.h
+++ b/flexdef.h
@@ -61,14 +61,14 @@
 /* Maximum line length we'll have to deal with. */
 #define MAXLINE 2048
 
-#ifndef min
-#define min(x,y) ((x) < (y) ? (x) : (y))
+#ifndef MIN
+#define MIN(x,y) ((x) < (y) ? (x) : (y))
 #endif
-#ifndef max
-#define max(x,y) ((x) > (y) ? (x) : (y))
+#ifndef MAX
+#define MAX(x,y) ((x) > (y) ? (x) : (y))
 #endif
-#ifndef abs
-#define abs(x) ((x) < 0 ? -(x) : (x))
+#ifndef ABS
+#define ABS(x) ((x) < 0 ? -(x) : (x))
 #endif
 
 

diff --git a/gen.c b/gen.c
index 34c605e744adf1c540450ceebd69c5ff74f20a37..c12849c62e00e09fcf8ce866c8bd3bbfe5ff5a1d 100644 (file)
--- a/gen.c
+++ b/gen.c
@@ -240,7 +240,7 @@ void genecs()
                if ( caseins && (i >= 'A') && (i <= 'Z') )
                        ecgroup[i] = ecgroup[clower( i )];
 
-               ecgroup[i] = abs( ecgroup[i] );
+               ecgroup[i] = ABS( ecgroup[i] );
                mkdata( ecgroup[i] );
                }
 
@@ -786,7 +786,7 @@ void gentabs()
                dfaacc[end_of_buffer_state].dfaacc_set = EOB_accepting_list;
 
                printf( long_align ? C_long_decl : C_short_decl,
-                       "yy_acclist", max( numas, 1 ) + 1 );
+                       "yy_acclist", MAX( numas, 1 ) + 1 );
 
                j = 1;  /* index into "yy_acclist" array */
 
@@ -910,9 +910,9 @@ void gentabs()
                        {
                        if ( trace )
                                fprintf( stderr, "%d = %d\n",
-                                       i, abs( tecbck[i] ) );
+                                       i, ABS( tecbck[i] ) );
 
-                       mkdata( abs( tecbck[i] ) );
+                       mkdata( ABS( tecbck[i] ) );
                        }
 
                dataend();

diff --git a/main.c b/main.c
index 8e9d10852a50fe8961b18f703bff1d4cbe1b4bd3..dd6d8cc34c67d5bdb7bf9601a4c0ac86fdcc226f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -873,7 +873,7 @@ void readin()
 
        /* Now map the equivalence class for NUL to its expected place. */
        ecgroup[0] = ecgroup[csize];
-       NUL_ec = abs( ecgroup[0] );
+       NUL_ec = ABS( ecgroup[0] );
 
        if ( useecs )
                ccl2ecl();

diff --git a/nfa.c b/nfa.c
index 24241768b28d43390fb8a36b06cd43f0daeff1b0..44e893d3f1e6de9dc816490942dcd1eb0eb73e8f 100644 (file)
--- a/nfa.c
+++ b/nfa.c
@@ -301,8 +301,8 @@ int first, last;
                {
                mkxtion( finalst[first], last );
                finalst[first] = finalst[last];
-               lastst[first] = max( lastst[first], lastst[last] );
-               firstst[first] = min( firstst[first], firstst[last] );
+               lastst[first] = MAX( lastst[first], lastst[last] );
+               firstst[first] = MIN( firstst[first], firstst[last] );
 
                return first;
                }

diff --git a/tblcmp.c b/tblcmp.c
index 654f95c3aeeef3038a88f9d0e2c30eabd9cf64a3..e8dd61540d543084603a9b10954b7e8630b3f199 100644 (file)
--- a/tblcmp.c
+++ b/tblcmp.c
@@ -610,7 +610,7 @@ int numchars, statenum, deflink, totaltrans;
                /* Ensure that the base address we eventually generate is
                 * non-negative.
                 */
-               baseaddr = max( tblend + 1, minec );
+               baseaddr = MAX( tblend + 1, minec );
                }
 
        tblbase = baseaddr - minec;
@@ -635,7 +635,7 @@ int numchars, statenum, deflink, totaltrans;
                for ( ++firstfree; chk[firstfree] != 0; ++firstfree )
                        ;
 
-       tblend = max( tblend, tbllast );
+       tblend = MAX( tblend, tbllast );
        }