1 files changed, 8 insertions, 27 deletions

diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 39e0c17..b31cbe9 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -293,30 +293,12 @@ typedef int              (xd3_comp_table_func) (xd3_stream *stream,
 #define XD3_ASSERT(x) (void)0
 #endif  /* XD3_DEBUG */
 
-#ifdef __GNUC__
-#ifndef max
-#define max(x,y) ({ \
-        const typeof(x) _x = (x);       \
-        const typeof(y) _y = (y);       \
-        (void) (&_x == &_y);            \
-        _x > _y ? _x : _y; })
-#endif /* __GNUC__ */
-
-#ifndef min
-#define min(x,y) ({ \
-        const typeof(x) _x = (x);       \
-        const typeof(y) _y = (y);       \
-        (void) (&_x == &_y);            \
-        _x < _y ? _x : _y; })
-#endif
-#else  /* __GNUC__ */
 #ifndef max
 #define max(x,y) ((x) < (y) ? (y) : (x))
 #endif
 #ifndef min
 #define min(x,y) ((x) < (y) ? (x) : (y))
 #endif
-#endif  /* __GNUC__ */
 
 /****************************************************************
  PUBLIC ENUMS
@@ -351,7 +333,7 @@ typedef enum {
   XD3_INVALID_INPUT = -17712, /* invalid input/decoder error */
   XD3_NOSECOND    = -17713, /* when secondary compression finds no
                                improvement. */
-  XD3_UNIMPLEMENTED = -17714, /* currently VCD_TARGET */
+  XD3_UNIMPLEMENTED = -17714  /* currently VCD_TARGET */
 } xd3_rvalues;
 
 /* special values in config->flags */
@@ -408,7 +390,7 @@ typedef enum
   XD3_COMPLEVEL_2 = (2 << XD3_COMPLEVEL_SHIFT),
   XD3_COMPLEVEL_3 = (3 << XD3_COMPLEVEL_SHIFT),
   XD3_COMPLEVEL_6 = (6 << XD3_COMPLEVEL_SHIFT),
-  XD3_COMPLEVEL_9 = (9 << XD3_COMPLEVEL_SHIFT),
+  XD3_COMPLEVEL_9 = (9 << XD3_COMPLEVEL_SHIFT)
 
 } xd3_flags;
 
@@ -423,7 +405,7 @@ typedef enum
   XD3_SMATCH_FAST    = 2,
   XD3_SMATCH_FASTER  = 3,
   XD3_SMATCH_FASTEST = 4,
-  XD3_SMATCH_SOFT    = 5,
+  XD3_SMATCH_SOFT    = 5
 } xd3_smatch_cfg;
 
 /*********************************************************************
@@ -448,7 +430,7 @@ typedef enum {
                           source/target. */
   MATCH_FORWARD   = 2, /* currently expanding a match forward in the
                           source/target. */
-  MATCH_SEARCHING = 3, /* currently searching for a match. */
+  MATCH_SEARCHING = 3  /* currently searching for a match. */
 
 } xd3_match_state;
 
@@ -467,7 +449,7 @@ typedef enum {
   ENC_FLUSH     = 4, /* currently emitting output. */
   ENC_POSTOUT   = 5, /* after an output section. */
   ENC_POSTWIN   = 6, /* after all output sections. */
-  ENC_ABORTED   = 7, /* abort. */
+  ENC_ABORTED   = 7  /* abort. */
 } xd3_encode_state;
 
 /* The xd3_decode_input state machine steps through these states in
@@ -520,7 +502,7 @@ typedef enum {
 
   DEC_FINISH   = 23, /* window finished */
 
-  DEC_ABORTED  = 24, /* xd3_abort_stream */
+  DEC_ABORTED  = 24  /* xd3_abort_stream */
 } xd3_decode_state;
 
 /************************************************************
@@ -841,8 +823,7 @@ struct _xd3_stream
                                        * if there is at least one
                                        * match in the buffer. */
 
-  // SRCWIN
-  // these variables plus srcwin_maxsz above (set by config)
+  /* SRCWIN: these variables plus srcwin_maxsz above (set by config) */
   int                srcwin_decided;    /* boolean: true if srclen and
                                            srcbase have been
                                            decided. */
@@ -851,7 +832,7 @@ struct _xd3_stream
                                                decided early. */
   xoff_t             srcwin_cksum_pos;  /* Source checksum position */
 
-  // MATCH
+  /* MATCH */
   xd3_match_state    match_state;      /* encoder match state */
   xoff_t             match_srcpos;     /* current match source
                                           position relative to