Merge pull request #188 from sebastic/gcc-15

rouault · web-flow · commit c79a2d761bf3 · 2025-09-24T03:03:17.000+02:00
Fix build failure with GCC 15 (bool is keyword).
diff --git a/dbfadd.c b/dbfadd.c
@@ -45,7 +45,7 @@ int main(int argc, char **argv)
     const int iRecord = DBFGetRecordCount(hDBF);
 
     SHPDate date;
-    char bool;
+    char boolean;
 
     // Loop assigning the new field values.
     for (int i = 0; i < DBFGetFieldCount(hDBF); i++)
@@ -64,9 +64,9 @@ int main(int argc, char **argv)
         }
         else if (DBFGetFieldInfo(hDBF, i, NULL, NULL, NULL) == FTLogical)
         {
-            if (1 == sscanf(argv[i + 2], "%c", &bool))
+            if (1 == sscanf(argv[i + 2], "%c", &boolean))
             {
-                DBFWriteLogicalAttribute(hDBF, iRecord, i, bool);
+                DBFWriteLogicalAttribute(hDBF, iRecord, i, boolean);
             }
         }
         else

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ int main(int argc, char **argv)`
`45`	`45`	`const int iRecord = DBFGetRecordCount(hDBF);`
`46`	`46`
`47`	`47`	`SHPDate date;`
`48`		`- char bool;`
	`48`	`+ char boolean;`
`49`	`49`
`50`	`50`	`// Loop assigning the new field values.`
`51`	`51`	`for (int i = 0; i < DBFGetFieldCount(hDBF); i++)`
`@@ -64,9 +64,9 @@ int main(int argc, char **argv)`
`64`	`64`	`}`
`65`	`65`	`else if (DBFGetFieldInfo(hDBF, i, NULL, NULL, NULL) == FTLogical)`
`66`	`66`	`{`
`67`		`- if (1 == sscanf(argv[i + 2], "%c", &bool))`
	`67`	`+ if (1 == sscanf(argv[i + 2], "%c", &boolean))`
`68`	`68`	`{`
`69`		`- DBFWriteLogicalAttribute(hDBF, iRecord, i, bool);`
	`69`	`+ DBFWriteLogicalAttribute(hDBF, iRecord, i, boolean);`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`else`