From 142117991fae65646bc5dd59d96c4a5c5e8559ca Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 10 八月 2017 14:54:25 +0800
Subject: [PATCH] bug fix
---
RtspFace/GraphicHelper.h | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/RtspFace/GraphicHelper.h b/RtspFace/GraphicHelper.h
index 36d7062..0dcd543 100644
--- a/RtspFace/GraphicHelper.h
+++ b/RtspFace/GraphicHelper.h
@@ -1,9 +1,19 @@
#ifndef _GRAPHIC_HELPER_H_
#define _GRAPHIC_HELPER_H_
+#ifdef __ANDROID__
+#undef _U
+#undef _L
+#undef _N
+#undef _S
+#undef _P
+#undef _C
+#undef _X
+#undef _B
+#endif
+
#include <stdint.h>
#include <vector>
-#include "GraphicHelper.h"
struct PLGH_Color_RGBA
{
--
Gitblit v1.8.0