6daf6a2 gcc needs __DECONST() — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

gcc needs __DECONST()

Matthew Seaman committed 13 years ago

commit 6daf6a2607cc5a6773c9b061b409109fba85ad61
parent b5100ee

1 file changed +5 -4

modified libpkg/elfhints.c

@@ -99,7 +99,7 @@ shlib_list_add(struct shlib_list **shlib_list, const char *dir,

 	/* If shlib_file is already in the shlib_list table, don't try
 	 * and add it again */
 	HASH_FIND_STR(*shlib_list, shlib_file, sl);
 	HASH_FIND_STR(*shlib_list, __DECONST(char *, shlib_file), sl);
 	if (sl != NULL)
 		return (EPKG_OK);

@@ -117,7 +117,8 @@ shlib_list_add(struct shlib_list **shlib_list, const char *dir,

 	sl->name = sl->path + dir_len;
 	HASH_ADD_KEYPTR(hh, *shlib_list, sl->name, strlen(sl->name), sl);
 	HASH_ADD_KEYPTR(hh, *shlib_list, __DECONST(char *, sl->name),
 			strlen(sl->name), sl);
 	return (EPKG_OK);
 }

@@ -129,11 +130,11 @@ shlib_list_find_by_name(const char *shlib_file)

 	assert(HASH_COUNT(shlibs) != 0);
 	HASH_FIND_STR(rpath, shlib_file, sl);
 	HASH_FIND_STR(rpath, __DECONST(char *, shlib_file), sl);
 	if (sl != NULL)
 		return (sl->path);
 	HASH_FIND_STR(shlibs, shlib_file, sl);
 	HASH_FIND_STR(shlibs, __DECONST(char *, shlib_file), sl);
 	if (sl != NULL)
 		return (sl->path);