fb9e0e2 Fix build with gcc 4.2 — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix build with gcc 4.2

Baptiste Daroussin committed 12 years ago

commit fb9e0e2ee4e9e8891676342b1460c80c21289e6a
parent 1e6b3e1

2 files changed +3 -3

modified libpkg/pkg_solve.c

@@ -212,7 +212,7 @@ pkg_solve_check_conflicts(struct pkg_solve_variable *var, bool guess)

 {
 	struct pkg_solve_item *it;
 	struct _pkg_solve_var_rule *rul;
 	bool test;
 	bool test = false;
 	LL_FOREACH(var->rules, rul) {
 		test = true;

modified libpkg/pkgdb.c

@@ -4329,7 +4329,7 @@ pkgdb_obtain_lock(struct pkgdb *db, pkgdb_lock_t type,

 			"UPDATE pkg_lock SET advisory=1 WHERE exclusive=0 AND advisory=0;";
 	const char exclusive_lock_sql[] = ""
 			"UPDATE pkg_lock SET exclusive=1 WHERE exclusive=0 AND advisory=0 AND read=0;";
 	const char *lock_sql;
 	const char *lock_sql = NULL;
 	assert(db != NULL);

@@ -4397,7 +4397,7 @@ pkgdb_release_lock(struct pkgdb *db, pkgdb_lock_t type)

 			"UPDATE pkg_lock SET advisory=0 WHERE advisory=1;";
 	const char exclusive_unlock_sql[] = ""
 			"UPDATE pkg_lock SET exclusive=0 WHERE exclusive=1;";
 	const char *unlock_sql;
 	const char *unlock_sql = NULL;
 	int ret = EPKG_FATAL;
 	assert(db != NULL);