prevent crafty users from breaking build if they define USE_OPENSSL and USE_GNUTLS
authordiscomfitor <discomfitor@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Thu, 29 Jul 2010 00:13:56 +0000 (00:13 +0000)
committerdiscomfitor <discomfitor@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Thu, 29 Jul 2010 00:13:56 +0000 (00:13 +0000)
git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@50626 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/lib/ecore_con/ecore_con_ssl.c

index d26286c..616ab9f 100644 (file)
@@ -124,7 +124,7 @@ ecore_con_ssl_shutdown(void)
      {
         client_count = 0;
         server_count = 0;
-#ifdef USE_OPENSSL
+#if USE_OPENSSL && !USE_GNUTLS
         private_count = 0;
 #endif
         SSL_SUFFIX(_ecore_con_ssl_shutdown) ();
@@ -624,7 +624,7 @@ _ecore_con_ssl_client_write_gnutls(Ecore_Con_Client *cl, unsigned char *buf,
    return -1;
 }
 
-#elif USE_OPENSSL
+#elif USE_OPENSSL && !USE_GNUTLS
 
 /*
  * OpenSSL