o remove duplicate MAX definition from slurmctld.h

 o define MIN in macros.h

src/common/macros.h

@@ -46,15 +46,19 @@ typedef enum {false, true} bool;
 #include "src/common/log.h"	/* for error() */
 
 #ifndef FALSE
-#define FALSE	false
+#  define FALSE	false
 #endif
 
 #ifndef TRUE
-#define TRUE	true
+#  define TRUE	true
 #endif
 
 #ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))	
+#  define MAX(a,b) ((a) > (b) ? (a) : (b))	
+#endif
+
+#ifndef MIN
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
 
 #define SLURM_IO_KEY_SIZE 8

src/slurmctld/slurmctld.h

@@ -40,7 +40,7 @@
 #endif
 
 #include <pthread.h>
-#include <stdlib.h>
+/* #include <stdlib.h> */
 #include <time.h>
 #include <sys/types.h>
 
@@ -71,8 +71,6 @@
 	((_X->job_state & (~JOB_COMPLETING)) >  JOB_RUNNING)
 #define IS_JOB_PENDING(_X)		\
 	((_X->job_state & (~JOB_COMPLETING)) == JOB_PENDING)
-#define MAX(x,y) (((x)>(y))?(x):(y))
-#define MIN(x,y) (((x)<(y))?(x):(y))
 
 /*****************************************************************************\
  *  GENERAL CONFIGURATION parameters and data structures