diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-16 09:02:38 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-16 09:02:38 +0000 |
| commit | 8cdfd1219a2d13d252a8691ee6dddb0d773bdc77 (patch) | |
| tree | 087318efba7eb0fb5e1c1d8422eca611abdee3e7 /src/gallium/auxiliary/os/os_llvm.h | |
| parent | 6420aca08ba6910dce22ab9f813cc57d611b0aa8 (diff) | |
| parent | e0ce4a4a0994211ead8e5a77cccdd2a084e8a288 (diff) | |
| download | external_mesa3d-8cdfd1219a2d13d252a8691ee6dddb0d773bdc77.zip external_mesa3d-8cdfd1219a2d13d252a8691ee6dddb0d773bdc77.tar.gz external_mesa3d-8cdfd1219a2d13d252a8691ee6dddb0d773bdc77.tar.bz2 | |
Merge commit 'origin/master' into gallium-sampler-view
This branch already seems to have the nv50_tex.c fix.
Conflicts:
src/gallium/drivers/nv50/nv50_tex.c
Diffstat (limited to 'src/gallium/auxiliary/os/os_llvm.h')
| -rw-r--r-- | src/gallium/auxiliary/os/os_llvm.h | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/src/gallium/auxiliary/os/os_llvm.h b/src/gallium/auxiliary/os/os_llvm.h deleted file mode 100644 index d5edfbf..0000000 --- a/src/gallium/auxiliary/os/os_llvm.h +++ /dev/null @@ -1,47 +0,0 @@ -/************************************************************************** - * - * Copyright 2010 VMware, Inc. - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sub license, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR - * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - **************************************************************************/ - -/** - * @file - * Wrapper for LLVM header file #includes. - */ - - -#ifndef OS_LLVM_H -#define OS_LLVM_H - - -#include <llvm-c/Core.h> - - -/** Set version to 0 if missing to avoid #ifdef HAVE_LLVM everywhere */ -#ifndef HAVE_LLVM -#define HAVE_LLVM 0x0 -#endif - - -#endif /* OS_LLVM_H */ |