diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-12-14 05:23:08 +0000 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-12-14 05:23:08 +0000 |
| commit | b308f06a3a3d368c38b0d109b7e6c1c639127148 (patch) | |
| tree | f37ea25991eac1bb7d4232db2973b6b2561843b2 /lib | |
| parent | f45b3356f8edcd1c90048d2b59ccb4577d0dcf02 (diff) | |
* Dan McGee's makepkg updates http://www.archlinux.org/pipermail/pacman-dev/2006-December/000792.html
* configure fixes (CFLAGS)
* no-strict-aliasing hacks until full C99 compliance
* --with-config-file configure option
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libalpm/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/libalpm/add.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index dbdc24db..9f555d22 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -1,6 +1,8 @@ AUTOMAKE_OPTIONS = gnu DEFINES = -pedantic -D_GNU_SOURCE -AM_CFLAGS = $(DEFINES) +#libalpm isn't fully C99 safe with the strict aliasing rules +# to be fixed in the future +AM_CFLAGS = $(DEFINES) -fno-strict-aliasing SUBDIRS = po localedir = $(datadir)/locale diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 957cd69b..51029d6d 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -250,7 +250,7 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, pmlist_t **data) QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, miss->target, miss->depend.name, NULL, &skip_this); if(skip_this) { pmpkg_t *pkg = NULL; - lp = _alpm_list_remove(lp, miss->depend.name, name_cmp, (void **)&pkg); + lp = _alpm_list_remove(lp, (void *)miss->depend.name, name_cmp, (void **)&pkg); FREEPKG(pkg); } } |