X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ffile_analysis.c;h=7ce65479bde929cb3e036ff73514522a9f4cddad;hb=0468e6992770e5082f2fb11cd93c2d8209e3f351;hp=530416e368cb1fd17a48f93fa7c9bc220b0f1a20;hpb=3b200f895cb7884c72d9e2409f047284027abc68;p=ccan

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index 530416e3..7ce65479 100644
--- a/tools/ccanlint/file_analysis.c
+++ b/tools/ccanlint/file_analysis.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "ccanlint.h"
 #include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
@@ -404,6 +405,17 @@ static bool parse_hash_if(struct pp_conditions *cond, const char **line)
 		return false;
 	if (!defined)
 		cond->type = PP_COND_IF;
+
+	/* FIXME: We just chain them, ignoring operators. */
+	if (get_token(line, "||") || get_token(line, "&&")) {
+		struct pp_conditions *sub = talloc(cond, struct pp_conditions);
+
+		sub->parent = cond->parent;
+		sub->type = PP_COND_IFDEF;
+		if (parse_hash_if(sub, line))
+			cond->parent = sub;
+	}
+
 	return true;
 }