Mesa (master): gallivm: Fix MSVC build.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Tue Jul 2 05:41:47 UTC 2013


Module: Mesa
Branch: master
Commit: 4c859901cebf04b37d8d458d58fc5ac0e24b4471
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c859901cebf04b37d8d458d58fc5ac0e24b4471

Author: José Fonseca <jfonseca at vmware.com>
Date:   Tue Jul  2 06:41:32 2013 +0100

gallivm: Fix MSVC build.

---

 .../auxiliary/gallivm/lp_bld_arit_overflow.c       |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit_overflow.c b/src/gallium/auxiliary/gallivm/lp_bld_arit_overflow.c
index 43f2660..124381d 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_arit_overflow.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_arit_overflow.c
@@ -62,9 +62,8 @@ build_binary_int_overflow(struct gallivm_state *gallivm,
                           LLVMValueRef b,
                           LLVMValueRef *ofbit)
 {
-   static const int MAX_INTR_STR = 256;
    LLVMBuilderRef builder = gallivm->builder;
-   char intr_str[MAX_INTR_STR];
+   char intr_str[256];
    LLVMTypeRef type_ref;
    LLVMTypeKind type_kind;
    LLVMTypeRef oelems[2] = {
@@ -82,18 +81,18 @@ build_binary_int_overflow(struct gallivm_state *gallivm,
 
    switch (LLVMGetIntTypeWidth(type_ref)) {
    case 16:
-      snprintf(intr_str, MAX_INTR_STR - 1, "%s.i16",
-               intr_prefix);
+      util_snprintf(intr_str, sizeof intr_str, "%s.i16",
+                    intr_prefix);
       oelems[0] = LLVMInt16TypeInContext(gallivm->context);
       break;
    case 32:
-      snprintf(intr_str, MAX_INTR_STR - 1, "%s.i32",
-               intr_prefix);
+      util_snprintf(intr_str, sizeof intr_str, "%s.i32",
+                    intr_prefix);
       oelems[0] = LLVMInt32TypeInContext(gallivm->context);
       break;
    case 64:
-      snprintf(intr_str, MAX_INTR_STR - 1, "%s.i64",
-               intr_prefix);
+      util_snprintf(intr_str, sizeof intr_str, "%s.i64",
+                    intr_prefix);
       oelems[0] = LLVMInt64TypeInContext(gallivm->context);
       break;
    default:




More information about the mesa-commit mailing list