Przeglądaj źródła

Sync with upstream bugfixes:
* Remove bogus semicolon after minams_param macro to fix else if chain. [KTIGCC 1]
* Fix typo causing invalid array access when renaming data variable. [KTIGCC 1]
* Remove bogus semicolon after minams_param macro to fix else if chain. [KTIGCC 2]

git-svn-id: file:///var/svn/tigccpp/branches/ktigcc-1-branch@1298 9552661e-59e3-4036-b4f2-dbe53926924f

debrouxl 15 lat temu
rodzic
commit
1c8557752c
2 zmienionych plików z 5 dodań i 6 usunięć
  1. 2 2
      ktigcc/mainform.ui.h
  2. 3 4
      ktigcc/tpr.cpp

+ 2 - 2
ktigcc/mainform.ui.h

@@ -9,7 +9,7 @@
 /*
    ktigcc - TIGCC IDE for KDE
 
-   Copyright (C) 2004-2007 Kevin Kofler
+   Copyright (C) 2004-2009 Kevin Kofler
    Copyright (C) 2006 Joey Adams
 
    This program is free software; you can redistribute it and/or modify
@@ -4385,7 +4385,7 @@ void MainForm::linkProject()
       char dextswrapped[numTargets][5]={".89y",".9xy",".v2y"};
       char (*dexts)[5]=(settings.outputbin&&!settings.pack)?dextsbin:dextswrapped;
       for (int target=0; target<numTargets; target++) {
-        if (targeted[numTargets]) {
+        if (targeted[target]) {
           qdir.remove(projectBaseName+"-data"+dexts[target]);
           if (!moveFile(linkOutput+dexts[target],
                         projectBaseName+"-data"+dexts[target])) {

+ 3 - 4
ktigcc/tpr.cpp

@@ -3,7 +3,7 @@
    
    tpr handling routines adapted from tprbuilder
    Copyright (C) 2002 Romain Liévin
-   Copyright (C) 2002-2006 Kevin Kofler
+   Copyright (C) 2002-2009 Kevin Kofler
    Copyright (C) 2006 Joey Adams
 
    This program is free software; you can redistribute it and/or modify
@@ -291,7 +291,6 @@ static int parse_file(FILE *f,TPRDataStruct *dest)
                 continue; \
             } else
             
-//this new macro was added to make merging with save_tpr more consistent.
 #define minams_param(token,setting) \
             if ( (p=find_param(buffer, "Minimum AMS Version=")) ) \
             { \
@@ -311,7 +310,7 @@ static int parse_file(FILE *f,TPRDataStruct *dest)
             boolean_param("Use Kernel=",use_kernel)
             boolean_param("Use PreOS=",use_preos)
             boolean_param("Minimum AMS Version Defined=",use_minams)
-            minams_param("Minimum AMS Version=",minams);
+            minams_param("Minimum AMS Version=",minams)
             boolean_param("Unofficial OS Support=",unofficial_os)
             reloc_param("Reloc Format=",reloc_format)
             reloc_param("ROM Call Format=",rom_call_format)
@@ -667,7 +666,7 @@ static int save_tpr(FILE *f,TPRDataStruct *dest)
     boolean_param("Use Kernel=",use_kernel)
     boolean_param("Use PreOS=",use_preos)
     boolean_param("Minimum AMS Version Defined=",use_minams)
-    minams_param("Minimum AMS Version=",minams);
+    minams_param("Minimum AMS Version=",minams)
     boolean_param("Unofficial OS Support=",unofficial_os)
     reloc_param("Reloc Format=",reloc_format)
     reloc_param("ROM Call Format=",rom_call_format)