Update master branch to next

This commit is contained in:
Dom Cobley
2012-12-27 19:00:17 +00:00
parent 83e1597d57
commit 9852ce2882
154 changed files with 9364 additions and 1581 deletions

View File

@@ -37,6 +37,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vc/intrinsics.h>
#endif
#ifdef __COVERITY__
#ifndef _Rarely
#define _Rarely(x) (x)
#endif
#ifndef _Usually
#define _Usually(x) (x)
#endif
#endif
#ifdef __cplusplus
extern "C" {
#endif

View File

@@ -28,9 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef VCORE_H
#define VCORE_H
#ifdef __HIGHC__
#ifdef __VIDEOCORE__
#include "vc/intrinsics.h"
#undef asm
#define asm(x) _ASM(x)