From def0da17c684d11d3825199bddd8de3d876bb556 Mon Sep 17 00:00:00 2001 From: "[CST] Bas" Date: Mon, 16 Feb 2015 22:24:10 +0800 Subject: [PATCH] lib/libcoolstream2/cnxtfb.h: only define FBIO_WAITFORVSYNC if it's not defined yet by kernel headers. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f4f61109479eb9d894ca0a7c88e2bc52b6e5b24d Author: [CST] Bas Date: 2015-02-16 (Mon, 16 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- lib/libcoolstream2/cnxtfb.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libcoolstream2/cnxtfb.h b/lib/libcoolstream2/cnxtfb.h index 4a51357a3..218c9f057 100644 --- a/lib/libcoolstream2/cnxtfb.h +++ b/lib/libcoolstream2/cnxtfb.h @@ -196,7 +196,9 @@ extern void cnxtfb_register_evnt_clbk(cnxtfb_notify pfnotify); #define FB_TEST_HW_ACCELERATION #define FBIOGET_CNXTFBHANDLE 0x4620 +#ifndef FBIO_WAITFORVSYNC #define FBIO_WAITFORVSYNC 0x4621 +#endif #define FBIO_STARTDISPLAY 0x4622 #define FBIO_STOPDISPLAY 0x4623 #define FBIO_SETBLENDMODE 0x4624