From 1485068dd04b2b6a2b4393d5d2d53b22d0c03389 Mon Sep 17 00:00:00 2001
From: Yifan Zhao <yifanz16@illinois.edu>
Date: Tue, 21 Jan 2020 15:47:49 -0600
Subject: [PATCH] Fixed header reordering breaking hpvm-cava

---
 hpvm/test/hpvm-cava/src/load_cam_model.c | 3 ++-
 hpvm/test/hpvm-cava/src/pipe_stages.h    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hpvm/test/hpvm-cava/src/load_cam_model.c b/hpvm/test/hpvm-cava/src/load_cam_model.c
index 3ef24cf429..baec19ad49 100644
--- a/hpvm/test/hpvm-cava/src/load_cam_model.c
+++ b/hpvm/test/hpvm-cava/src/load_cam_model.c
@@ -1,9 +1,10 @@
 #include "load_cam_model.h"
-#include "pipe_stages.h"
 #include "utility.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+// clang-format: pipe_stages.h must come after stdlib.h
+#include "pipe_stages.h"
 #include <string.h>
 
 // Get color space transform
diff --git a/hpvm/test/hpvm-cava/src/pipe_stages.h b/hpvm/test/hpvm-cava/src/pipe_stages.h
index f960822a03..4fa24354c7 100644
--- a/hpvm/test/hpvm-cava/src/pipe_stages.h
+++ b/hpvm/test/hpvm-cava/src/pipe_stages.h
@@ -2,6 +2,7 @@
 #define _PIPE_STAGES_H_
 
 #include "defs.h"
+#include <stddef.h>
 
 #define CHAN_SIZE 3
 
-- 
GitLab