X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Flikely%2Flikely.h;h=a8f003d72777bf884dbd9831c30eb0b0f0a2ae94;hp=410772dbde78a37ec99c64261758961ae2f2821b;hb=33527c60ba3c5c72ed31fbb064c38db2b3d2c733;hpb=0e5d0e30b30bb07b6605843e5ff224210d8083d8

diff --git a/ccan/likely/likely.h b/ccan/likely/likely.h
index 410772db..a8f003d7 100644
--- a/ccan/likely/likely.h
+++ b/ccan/likely/likely.h
@@ -1,8 +1,7 @@
-/* Licensed under LGPLv2.1+ - see LICENSE file for details */
+/* CC0 (Public domain) - see LICENSE file for details */
 #ifndef CCAN_LIKELY_H
 #define CCAN_LIKELY_H
 #include "config.h"
-#include <ccan/str/str.h>
 #include <stdbool.h>
 
 #ifndef CCAN_LIKELY_DEBUG
@@ -57,6 +56,8 @@
 #define unlikely(cond) (!!(cond))
 #endif
 #else /* CCAN_LIKELY_DEBUG versions */
+#include <ccan/str/str.h>
+
 #define likely(cond) \
 	(_likely_trace(!!(cond), 1, stringify(cond), __FILE__, __LINE__))
 #define unlikely(cond) \
@@ -65,9 +66,6 @@
 long _likely_trace(bool cond, bool expect,
 		   const char *condstr,
 		   const char *file, unsigned int line);
-#endif
-
-#ifdef CCAN_LIKELY_DEBUG
 /**
  * likely_stats - return description of abused likely()/unlikely()
  * @min_hits: minimum number of hits