From 83bdd23a08cbfda17f0020f58e9227db1acd5470 Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Mon, 11 Jan 2021 12:28:11 +0800
Subject: [PATCH] Fix build error after merge utilpp.h to util.h (#19714)

* fix std::atomic build error

* remove include util.h
---
 selfdrive/common/visionimg.cc |  1 -
 selfdrive/common/visionimg.h  | 14 +-------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/selfdrive/common/visionimg.cc b/selfdrive/common/visionimg.cc
index 85aead69a6..925abe0ff9 100644
--- a/selfdrive/common/visionimg.cc
+++ b/selfdrive/common/visionimg.cc
@@ -25,7 +25,6 @@
 
 #endif // ifdef QCOM
 
-#include "common/util.h"
 #include "common/visionimg.h"
 
 #ifdef QCOM
diff --git a/selfdrive/common/visionimg.h b/selfdrive/common/visionimg.h
index 5919fc55e0..40a8fb8214 100644
--- a/selfdrive/common/visionimg.h
+++ b/selfdrive/common/visionimg.h
@@ -1,6 +1,4 @@
-#ifndef VISIONIMG_H
-#define VISIONIMG_H
-
+#pragma once
 #include "visionbuf.h"
 #include "common/glutil.h"
 
@@ -13,10 +11,6 @@ typedef int EGLImageKHR;
 typedef void *EGLClientBuffer;
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define VISIONIMG_FORMAT_RGB24 1
 
 typedef struct VisionImg {
@@ -29,9 +23,3 @@ typedef struct VisionImg {
 
 GLuint visionimg_to_gl(const VisionImg *img, EGLImageKHR *pkhr, void **pph);
 void visionimg_destroy_gl(EGLImageKHR khr, void *ph);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif