Mercurial > pidgin3 / changeset

• changeset
• raw

changeset

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

Thu, 11 Jul 2013 19:18:59 -0400

author

Daniel Atallah <datallah@pidgin.im>

date

Thu, 11 Jul 2013 19:18:59 -0400

changeset 34250

1625de486023

parent 34249

0a42907dce4f

child 34251

dc0aea0981c0

child 34759

545149898f9a

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.

--- a/libpurple/ciphers/aes.c	Thu Jul 11 19:18:59 2013 -0400
+++ b/libpurple/ciphers/aes.c	Thu Jul 11 19:18:59 2013 -0400
@@ -276,9 +276,7 @@
 	return TRUE;
 }
 
-#endif /* PURPLE_AES_USE_GNUTLS */
-
-#ifdef PURPLE_AES_USE_NSS
+#elif defined(PURPLE_AES_USE_NSS)
 
 typedef struct
 {