summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2014-01-10 05:32:38 +0100
committerAllan McRae <allan@archlinux.org>2014-01-10 05:32:38 +0100
commitbce495e56f3d5d909bbc2a116cf5776c3621cd89 (patch)
treebf5d1017f0beb3d0c062f346539ea7ba16b98b39
parent1d3b17e25124c6c38f994b5bdf1beceaec1f0049 (diff)
downloadpacman-bce495e56f3d5d909bbc2a116cf5776c3621cd89.tar.gz
pacman-bce495e56f3d5d909bbc2a116cf5776c3621cd89.tar.xz
Consistently use #ifdef
Fix the occurances of #if to be #ifdef for consistency.
-rw-r--r--lib/libalpm/signing.c6
-rw-r--r--lib/libalpm/sync.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index 8ed8c14e..7c887860 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -21,7 +21,7 @@
#include <stdio.h>
#include <string.h>
-#if HAVE_LIBGPGME
+#ifdef HAVE_LIBGPGME
#include <locale.h> /* setlocale() */
#include <gpgme.h>
#endif
@@ -64,7 +64,7 @@ error:
return -1;
}
-#if HAVE_LIBGPGME
+#ifdef HAVE_LIBGPGME
#define CHECK_ERR(void) do { \
if(gpg_err_code(gpg_err) != GPG_ERR_NO_ERROR) { goto gpg_error; } \
} while(0)
@@ -942,7 +942,7 @@ int SYMEXPORT alpm_siglist_cleanup(alpm_siglist_t *siglist)
for(num = 0; num < siglist->count; num++) {
alpm_sigresult_t *result = siglist->results + num;
if(result->key.data) {
-#if HAVE_LIBGPGME
+#ifdef HAVE_LIBGPGME
gpgme_key_unref(result->key.data);
#endif
} else {
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 4ae01ac0..945fdb0e 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -1221,7 +1221,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)
return -1;
}
-#if HAVE_LIBGPGME
+#ifdef HAVE_LIBGPGME
/* make sure all required signatures are in keyring */
if(check_keyring(handle)) {
return -1;