Mesa (gallium-0.2): gallivm: fix some small stuff.

[Stephane Marchesin]

Module: Mesa
Branch: gallium-0.2
Commit: 7b0e0e1a0d571291851e8a7b2e64c8425055cd69
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7b0e0e1a0d571291851e8a7b2e64c8425055cd69

Author: Stephane Marchesin <marchesin at icps.u-strasbg.fr>
Date:   Sun Nov 16 20:32:05 2008 +0100

gallivm: fix some small stuff.

---

 src/gallium/auxiliary/gallivm/gallivm_p.h |    4 ++--
 src/gallium/auxiliary/gallivm/storage.cpp |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/gallivm_p.h b/src/gallium/auxiliary/gallivm/gallivm_p.h
index ebf3e11..d2c5852 100644
--- a/src/gallium/auxiliary/gallivm/gallivm_p.h
+++ b/src/gallium/auxiliary/gallivm/gallivm_p.h
@@ -101,10 +101,10 @@ static INLINE int gallivm_w_swizzle(int swizzle)
    return w;
 }
 
-#endif /* MESA_LLVM */
-
 #if defined __cplusplus
 }
 #endif
 
+#endif /* MESA_LLVM */
+
 #endif
diff --git a/src/gallium/auxiliary/gallivm/storage.cpp b/src/gallium/auxiliary/gallivm/storage.cpp
index 6f373f6..73df24c 100644
--- a/src/gallium/auxiliary/gallivm/storage.cpp
+++ b/src/gallium/auxiliary/gallivm/storage.cpp
@@ -323,7 +323,7 @@ llvm::Value * Storage::elemIdx(llvm::Value *ptr, int idx,
 
    if (indIdx) {
       getElem = GetElementPtrInst::Create(ptr,
-                                      BinaryOperator::create(Instruction::Add,
+                                      BinaryOperator::Create(Instruction::Add,
                                                              indIdx,
                                                              constantInt(idx),
                                                              name("add"),