r1422 - in branches/1.0: . include

[des at projects.linpro.no]

Author: des
Date: 2007-05-15 13:19:29 +0200 (Tue, 15 May 2007)
New Revision: 1422

Modified:
   branches/1.0/
   branches/1.0/include/libvarnish.h
Log:
Merged revisions 1419-1421 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

................
  r1419 | des | 2007-05-14 11:42:16 +0200 (Mon, 14 May 2007) | 78 lines
  
  [accidental commit of unfinished negative-caching patch]
................
  r1420 | des | 2007-05-15 13:01:34 +0200 (Tue, 15 May 2007) | 2 lines
  
  AN() and XXXAN() are also useful for non-pointer results.
................
  r1421 | des | 2007-05-15 13:15:49 +0200 (Tue, 15 May 2007) | 2 lines
  
  Revert accidental commit of unfinished negative-caching patch.
................



Property changes on: branches/1.0
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1315,1359-1387,1394,1399-1418
   + /trunk/varnish-cache:1-1315,1359-1387,1394,1399-1421

Modified: branches/1.0/include/libvarnish.h
===================================================================
--- branches/1.0/include/libvarnish.h	2007-05-15 11:15:49 UTC (rev 1421)
+++ branches/1.0/include/libvarnish.h	2007-05-15 11:19:29 UTC (rev 1422)
@@ -80,6 +80,6 @@
 
 /* Assert zero return value */
 #define AZ(foo)	do { assert((foo) == 0); } while (0)
-#define AN(foo)	do { assert((foo) != NULL); } while (0)
+#define AN(foo)	do { assert((foo) != 0); } while (0)
 #define XXXAZ(foo)	do { xxxassert((foo) == 0); } while (0)
-#define XXXAN(foo)	do { xxxassert((foo) != NULL); } while (0)
+#define XXXAN(foo)	do { xxxassert((foo) != 0); } while (0)