Fix warnings

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5377 91177308-0d34-0410-b5e6-96231b3b80d8

8 files changed, 26 insertions, 16 deletions

diff --git a/support/tools/Burg/be.c b/support/tools/Burg/be.c
index 31db211a70..defe948d2d 100644
--- a/support/tools/Burg/be.c
+++ b/support/tools/Burg/be.c
@@ -688,14 +688,14 @@ makeRuleDescArray2()
 		fprintf(outfile, "\t");
 		if (pVector[i]) {
 			Operator o;
-			NonTerminal t;
+			NonTerminal t1, t2;
 
 			fprintf(outfile, "{");
 			fprintf(outfile, "%5d, %5d, %5d, %5d",
 				pVector[i]->rule->lhs->num,
 				(o = pVector[i]->rule->pat->op) ? o->num : 0,
-				(t = pVector[i]->rule->pat->children[0]) ? t->num : 0,
-				(t = pVector[i]->rule->pat->children[1]) ? t->num : 0
+				(t1 = pVector[i]->rule->pat->children[0]) ? t1->num : 0,
+				(t2 = pVector[i]->rule->pat->children[1]) ? t2->num : 0
 				);
 			fprintf(outfile, "} /* ");
 			printRule(pVector[i], "0");
diff --git a/support/tools/Burg/fe.h b/support/tools/Burg/fe.h
index 70e98e2215..1c7b2fecbf 100644
--- a/support/tools/Burg/fe.h
+++ b/support/tools/Burg/fe.h
@@ -58,6 +58,11 @@ struct strTable {
 };
 typedef struct strTable	*StrTable;
 
+extern void doGrammarNts ARGS((void));
+void makeRuleDescArray ARGS((void));
+void makeDeltaCostArray ARGS((void));
+void makeStateStringArray ARGS((void));
+
 extern StrTable newStrTable ARGS((void));
 extern StrTableElement addString ARGS((StrTable, char *, int, int *));
 
diff --git a/support/tools/Burg/main.c b/support/tools/Burg/main.c
index 5c13698f1c..dbfdbf4fac 100644
--- a/support/tools/Burg/main.c
+++ b/support/tools/Burg/main.c
@@ -15,9 +15,9 @@ static char *outFileName;
 
 static char version[] = "BURG, Version 1.0";
 
-extern void main ARGS((int argc, char **argv));
+extern int main ARGS((int argc, char **argv));
 
-void
+int
 main(argc, argv) int argc; char **argv;
 {
 	int i;
@@ -33,7 +33,7 @@ main(argc, argv) int argc; char **argv;
 				fprintf(stderr, "%s\n", version);
 				break;
 			case 'p':
-				needStr = &prefix;
+				needStr = (char**)&prefix;
 				break;
 			case 'o':
 				needStr = &outFileName;
diff --git a/support/tools/Burg/plank.c b/support/tools/Burg/plank.c
index e6ba38ba80..1ce006dd01 100644
--- a/support/tools/Burg/plank.c
+++ b/support/tools/Burg/plank.c
@@ -232,7 +232,7 @@ renumber()
 	for (i = 1; i < globalMap->count; i++) {
 		sortedStates[i-1] = globalMap->set[i];
 	}
-	qsort(sortedStates, globalMap->count-1, sizeof(Item_Set), stateCompare);
+	qsort(sortedStates, globalMap->count-1, sizeof(Item_Set), (int(*)(const void *, const void *))stateCompare);
 	previousOp = 0;
 	for (i = 0; i < globalMap->count-1; i++) {
 		sortedStates[i]->newNum = i;
@@ -246,7 +246,7 @@ renumber()
 	sortedRules = (RuleAST*) zalloc(max_ruleAST * sizeof(RuleAST));
 	count = 0;
 	foreachList((ListFn) assignRules, ruleASTs);
-	qsort(sortedRules, max_ruleAST, sizeof(RuleAST), ruleCompare);
+	qsort(sortedRules, max_ruleAST, sizeof(RuleAST), (int(*)(const void *, const void *))ruleCompare);
 	previousLHS = 0;
 	base_counter = 0;
 	for (i = 0; i < max_ruleAST; i++) {
diff --git a/utils/Burg/be.c b/utils/Burg/be.c
index 31db211a70..defe948d2d 100644
--- a/utils/Burg/be.c
+++ b/utils/Burg/be.c
@@ -688,14 +688,14 @@ makeRuleDescArray2()
 		fprintf(outfile, "\t");
 		if (pVector[i]) {
 			Operator o;
-			NonTerminal t;
+			NonTerminal t1, t2;
 
 			fprintf(outfile, "{");
 			fprintf(outfile, "%5d, %5d, %5d, %5d",
 				pVector[i]->rule->lhs->num,
 				(o = pVector[i]->rule->pat->op) ? o->num : 0,
-				(t = pVector[i]->rule->pat->children[0]) ? t->num : 0,
-				(t = pVector[i]->rule->pat->children[1]) ? t->num : 0
+				(t1 = pVector[i]->rule->pat->children[0]) ? t1->num : 0,
+				(t2 = pVector[i]->rule->pat->children[1]) ? t2->num : 0
 				);
 			fprintf(outfile, "} /* ");
 			printRule(pVector[i], "0");
diff --git a/utils/Burg/fe.h b/utils/Burg/fe.h
index 70e98e2215..1c7b2fecbf 100644
--- a/utils/Burg/fe.h
+++ b/utils/Burg/fe.h
@@ -58,6 +58,11 @@ struct strTable {
 };
 typedef struct strTable	*StrTable;
 
+extern void doGrammarNts ARGS((void));
+void makeRuleDescArray ARGS((void));
+void makeDeltaCostArray ARGS((void));
+void makeStateStringArray ARGS((void));
+
 extern StrTable newStrTable ARGS((void));
 extern StrTableElement addString ARGS((StrTable, char *, int, int *));
 
diff --git a/utils/Burg/main.c b/utils/Burg/main.c
index 5c13698f1c..dbfdbf4fac 100644
--- a/utils/Burg/main.c
+++ b/utils/Burg/main.c
@@ -15,9 +15,9 @@ static char *outFileName;
 
 static char version[] = "BURG, Version 1.0";
 
-extern void main ARGS((int argc, char **argv));
+extern int main ARGS((int argc, char **argv));
 
-void
+int
 main(argc, argv) int argc; char **argv;
 {
 	int i;
@@ -33,7 +33,7 @@ main(argc, argv) int argc; char **argv;
 				fprintf(stderr, "%s\n", version);
 				break;
 			case 'p':
-				needStr = &prefix;
+				needStr = (char**)&prefix;
 				break;
 			case 'o':
 				needStr = &outFileName;
diff --git a/utils/Burg/plank.c b/utils/Burg/plank.c
index e6ba38ba80..1ce006dd01 100644
--- a/utils/Burg/plank.c
+++ b/utils/Burg/plank.c
@@ -232,7 +232,7 @@ renumber()
 	for (i = 1; i < globalMap->count; i++) {
 		sortedStates[i-1] = globalMap->set[i];
 	}
-	qsort(sortedStates, globalMap->count-1, sizeof(Item_Set), stateCompare);
+	qsort(sortedStates, globalMap->count-1, sizeof(Item_Set), (int(*)(const void *, const void *))stateCompare);
 	previousOp = 0;
 	for (i = 0; i < globalMap->count-1; i++) {
 		sortedStates[i]->newNum = i;
@@ -246,7 +246,7 @@ renumber()
 	sortedRules = (RuleAST*) zalloc(max_ruleAST * sizeof(RuleAST));
 	count = 0;
 	foreachList((ListFn) assignRules, ruleASTs);
-	qsort(sortedRules, max_ruleAST, sizeof(RuleAST), ruleCompare);
+	qsort(sortedRules, max_ruleAST, sizeof(RuleAST), (int(*)(const void *, const void *))ruleCompare);
 	previousLHS = 0;
 	base_counter = 0;
 	for (i = 0; i < max_ruleAST; i++) {