[Radmind-commit] radmind command.c,1.127,1.127.2.1 config.h.in,1.6,1.6.2.1 retr.c,1.53,1.53.2.1

[Patrick M. <ume...@us...>]

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14176

Modified Files:
      Tag: radmind-1-6-0-branch
	command.c config.h.in retr.c 
Log Message:
Moved MIN and MAX defs into config.h.in for Solaris 9 compatibility.


Index: config.h.in
===================================================================
RCS file: /cvsroot/radmind/radmind/config.h.in,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** config.h.in	24 Jan 2006 20:47:52 -0000	1.6
--- config.h.in	21 Feb 2006 21:23:03 -0000	1.6.2.1
***************
*** 27,28 ****
--- 27,33 ----
  
  #undef HAVE_ZLIB
+ 
+ #ifdef sun
+ #define MIN(a,b)        ((a)<(b)?(a):(b))
+ #define MAX(a,b)        ((a)>(b)?(a):(b))
+ #endif /* sun */

Index: retr.c
===================================================================
RCS file: /cvsroot/radmind/radmind/retr.c,v
retrieving revision 1.53
retrieving revision 1.53.2.1
diff -C2 -d -r1.53 -r1.53.2.1
*** retr.c	24 Jan 2006 20:44:31 -0000	1.53
--- retr.c	21 Feb 2006 21:23:03 -0000	1.53.2.1
***************
*** 40,47 ****
  #include "progress.h"
  
- #ifdef sun
- #define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
- #endif /* sun */
- 
  extern void            (*logger)( char * );
  extern struct timeval  	timeout;
--- 40,43 ----

Index: command.c
===================================================================
RCS file: /cvsroot/radmind/radmind/command.c,v
retrieving revision 1.127
retrieving revision 1.127.2.1
diff -C2 -d -r1.127 -r1.127.2.1
*** command.c	6 Feb 2006 21:23:08 -0000	1.127
--- command.c	21 Feb 2006 21:23:03 -0000	1.127.2.1
***************
*** 58,66 ****
  #include "connect.h"
  
- #ifdef sun
- #define MIN(a,b)	((a)<(b)?(a):(b))
- #define MAX(a,b)	((a)>(b)?(a):(b))
- #endif /* sun */
- 
  #define	DEFAULT_MODE 0444
  #define DEFAULT_UID     0
--- 58,61 ----