Changeset 2810 in kBuild

Timestamp:

Mar 12, 2016 1:23:30 PM (9 years ago)

Author:

bird

Message:

MSVC build fixes.

File:

• trunk/src/kmk/kmk_cc_exec.c (modified) (6 diffs)

trunk/src/kmk/kmk_cc_exec.c

@@ -127 +127 @@
  * Place between scope (if any) and return type.  */
 #ifdef _MSC_VER
-# define KMK_CC_FN_NO_RETURN                        declspec(noreturn)
+# define KMK_CC_FN_NO_RETURN                        __declspec(noreturn)
 #elif defined(__GNUC__)
 # define KMK_CC_FN_NO_RETURN                        __attribute__((__noreturn__))
@@ -5451 +5451 @@
 static int kmk_cc_eval_do_var_unexport(PKMKCCEVALCOMPILER pCompiler, const char *pchWord, size_t cchLeft, unsigned fQualifiers)
 {
+    PKMKCCEVALCORE pInstr;
+
     /*
      * Join paths with undefine and export, unless it's an unexport all directive.
@@ -5461 +5463 @@
      * We're unexporting all variables.
      */
-    PKMKCCEVALCORE pInstr = kmk_cc_block_alloc_eval(pCompiler->ppBlockTail, sizeof(*pInstr));
+    pInstr = kmk_cc_block_alloc_eval(pCompiler->ppBlockTail, sizeof(*pInstr));
     pInstr->enmOpcode = kKmkCcEvalInstr_unexport_all;
     pInstr->iLine     = pCompiler->iLine;
@@ -5888 +5890 @@
     if (cchLeft)
     {
+        unsigned iSavedEscEol;
+        unsigned cWords;
+
         /*
          * We need to figure out whether this is an assignment or a export statement,
@@ -5902 +5907 @@
          * assignment keywords and operators.
          */
-        unsigned iSavedEscEol = pCompiler->iEscEol;
-        unsigned cWords       = kmk_cc_eval_parse_words(pCompiler, pchWord, cchLeft);
+        iSavedEscEol = pCompiler->iEscEol;
+        cWords       = kmk_cc_eval_parse_words(pCompiler, pchWord, cchLeft);
         if (cWords)
         {
+            PKMKCCEVALVARIABLES pInstr;
             PKMKCCEVALWORD pWord = pCompiler->paWords;
             unsigned       iWord = 0;
@@ -5958 +5964 @@
              * (This is the same as kmk_cc_eval_do_with_variable_list does.)
              */
-            PKMKCCEVALVARIABLES pInstr = (PKMKCCEVALVARIABLES)kmk_cc_block_alloc_eval(pCompiler->ppBlockTail,
-                                                                                      KMKCCEVALVARIABLES_SIZE(cWords));
+            pInstr = (PKMKCCEVALVARIABLES)kmk_cc_block_alloc_eval(pCompiler->ppBlockTail, KMKCCEVALVARIABLES_SIZE(cWords));
             pInstr->Core.enmOpcode = kKmkCcEvalInstr_export;
             pInstr->Core.iLine     = pCompiler->iLine;