/pidgin/main: 1625de486023: Fix pre-processing directives to con...

[Daniel Atallah]

Changeset: 1625de4860234df82174c607f40686fcd4b95990
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2013-07-11 19:18 -0400
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/1625de486023

Description:

Fix pre-processing directives to consistently only inclde code that will be used.

 * I'm not really happy that this automatically uses GnuTLS over NSS when both
   are available, but that's a bigger issue.

diffstat:

 libpurple/ciphers/aes.c |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (14 lines):

diff --git a/libpurple/ciphers/aes.c b/libpurple/ciphers/aes.c
--- a/libpurple/ciphers/aes.c
+++ b/libpurple/ciphers/aes.c
@@ -276,9 +276,7 @@ purple_aes_decrypt_gnutls(const guchar *
 	return TRUE;
 }
 
-#endif /* PURPLE_AES_USE_GNUTLS */
-
-#ifdef PURPLE_AES_USE_NSS
+#elif defined(PURPLE_AES_USE_NSS)
 
 typedef struct
 {