From 4e8485b0ddecb55f72929dd6233f254a1e7bf5b0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 11 Jul 2010 22:39:53 +0000 Subject: asy 2.02 git-svn-id: svn://tug.org/texlive/trunk@19378 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/asymptote/prc/PRC.h | 2 +- Build/source/utils/asymptote/prc/PRCbitStream.h | 2 +- Build/source/utils/asymptote/prc/writePRC.cc | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'Build/source/utils/asymptote/prc') diff --git a/Build/source/utils/asymptote/prc/PRC.h b/Build/source/utils/asymptote/prc/PRC.h index eee8dcf928d..8acaa453ca3 100644 --- a/Build/source/utils/asymptote/prc/PRC.h +++ b/Build/source/utils/asymptote/prc/PRC.h @@ -1,7 +1,7 @@ #ifndef __PRC_H #define __PRC_H -#include +#include //const uint32_t PRCVersion=7094; // For Adobe Reader 8 or later const uint32_t PRCVersion=8137; // For Adobe Reader 9 or later diff --git a/Build/source/utils/asymptote/prc/PRCbitStream.h b/Build/source/utils/asymptote/prc/PRCbitStream.h index 58342812c36..89482168f9e 100644 --- a/Build/source/utils/asymptote/prc/PRCbitStream.h +++ b/Build/source/utils/asymptote/prc/PRCbitStream.h @@ -21,9 +21,9 @@ #ifndef __PRC_BIT_STREAM_H #define __PRC_BIT_STREAM_H +#include #include #include -#include #define CHUNK_SIZE (1024) // Is this a reasonable initial size? diff --git a/Build/source/utils/asymptote/prc/writePRC.cc b/Build/source/utils/asymptote/prc/writePRC.cc index 8f1d7370f33..7e1e1358bd9 100644 --- a/Build/source/utils/asymptote/prc/writePRC.cc +++ b/Build/source/utils/asymptote/prc/writePRC.cc @@ -31,10 +31,14 @@ using namespace std; +#ifndef __GNUC_PREREQ +#define __GNUC_PREREQ(maj, min) (0) +#endif + // Count leading zeros. uint32_t CLZ(uint32_t a) { -#ifdef __GNUC__ +#if __GNUC_PREREQ(3,4) return __builtin_clz(a); #else // find the log base 2 of a 32-bit integer @@ -49,7 +53,7 @@ uint32_t CLZ(uint32_t a) a |= a >> 8; a |= a >> 16; - return 31-MultiplyDeBruijnBitPosition[(unsignedInt)(a * 0x07C4ACDDU) >> 27]; + return 31-MultiplyDeBruijnBitPosition[(uint32_t)(a * 0x07C4ACDDU) >> 27]; #endif } -- cgit v1.2.3