X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2Flp_test.h;h=3d00b01253cae6d948d4b659b88acd21895bcd2d;hb=01ab218bbc5c8058a99077a6bc3dc9884e9d218a;hp=a9b99945f9277759e94d496eb657fb9ded445338;hpb=a8238bb08a95e7ea4430450c304a6bee210df1a6;p=mesa.git

diff --git a/src/gallium/drivers/llvmpipe/lp_test.h b/src/gallium/drivers/llvmpipe/lp_test.h
index a9b99945f92..3d00b01253c 100644
--- a/src/gallium/drivers/llvmpipe/lp_test.h
+++ b/src/gallium/drivers/llvmpipe/lp_test.h
@@ -41,12 +41,7 @@
 #include <stdio.h>
 #include <float.h>
 
-#include <llvm-c/Core.h>
-#include <llvm-c/Analysis.h>
-#include <llvm-c/ExecutionEngine.h>
-#include <llvm-c/Target.h>
-#include <llvm-c/BitWriter.h>
-#include <llvm-c/Transforms/Scalar.h>
+#include "gallivm/lp_bld.h"
 
 #include "pipe/p_state.h"
 #include "util/u_format.h"
@@ -64,8 +59,11 @@ write_tsv_header(FILE *fp);
 
 
 boolean
-test_some(unsigned verbose, FILE *fp, unsigned long n);
+test_some(unsigned verbose, FILE *fp,
+          unsigned long n);
 
+boolean
+test_single(unsigned verbose, FILE *fp);
 
 boolean
 test_all(unsigned verbose, FILE *fp);
@@ -73,13 +71,12 @@ test_all(unsigned verbose, FILE *fp);
 
 #if defined(PIPE_CC_MSVC)
 
-unsigned __int64 __rdtsc();
-#pragma intrinsic(__rdtsc)
+#include <intrin.h>
 #define rdtsc() __rdtsc()
 
 #elif defined(PIPE_CC_GCC) && (defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64))
 
-static INLINE uint64_t
+static inline uint64_t
 rdtsc(void)
 {
    uint32_t hi, lo;