[naviserver-commits] naviserver/include ns.h,1.52,1.53 nsthread.h,1.9,1.10

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22477/include

Modified Files:
	ns.h nsthread.h 
Log Message:
        * include/ns.h:
        * include/nsthread.h: MIN and MAX are defined after all, in
        sys/param.h. Include this header.
        * nsd/modload.c: Don't delete interp, de-allocate.


Index: ns.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** ns.h	9 Oct 2005 04:42:30 -0000	1.52
--- ns.h	9 Oct 2005 22:14:53 -0000	1.53
***************
*** 250,259 ****
  #define STREQ(a,b)              (((*a) == (*b)) && (strcmp((a),(b)) == 0))
  #define STRIEQ(a,b)             (strcasecmp((a),(b)) == 0)
- #ifndef MIN
- #  define MIN(x,y) ((x) > (y) ? (y) : (x))
- #endif
- #ifndef MAX
- #  define MAX(x,y) ((x) > (y) ? (x) : (y))
- #endif
  #define Ns_IndexCount(X)        ((X)->n)
  #define Ns_ListPush(elem,list)  ((list)=Ns_ListCons((elem),(list)))
--- 250,253 ----

Index: nsthread.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/nsthread.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** nsthread.h	30 Jul 2005 04:24:34 -0000	1.9
--- nsthread.h	9 Oct 2005 22:14:53 -0000	1.10
***************
*** 144,147 ****
--- 144,150 ----
  #include <inttypes.h>
  #endif
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
  
  /*