[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-commit
Subject:    [cups.commit] [CUPS] r10009 - branches/branch-1.5/cups
From:       cups-dev () easysw ! com
Date:       2011-09-21 5:03:54
Message-ID: 10780-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2011-09-20 22:03:54 -0700 (Tue, 20 Sep 2011)
New Revision: 10009
Log:
Mirror fix from trunk.


Modified:
   branches/branch-1.5/cups/http.c

Modified: branches/branch-1.5/cups/http.c
===================================================================
--- branches/branch-1.5/cups/http.c	2011-09-21 05:03:38 UTC (rev 10008)
+++ branches/branch-1.5/cups/http.c	2011-09-21 05:03:54 UTC (rev 10009)
@@ -3768,6 +3768,7 @@
   return (error);
 }
 #  endif /* HAVE_CDSASSL && HAVE_SECCERTIFICATECOPYDATA */
+#endif /* HAVE_SSL */
 
 
 /*
@@ -3816,6 +3817,7 @@
 }
 
 
+#ifdef HAVE_SSL
 /*
  * 'http_setup_ssl()' - Set up SSL/TLS support on a connection.
  */
@@ -4263,10 +4265,8 @@
 
   return (0);
 }
-#endif /* HAVE_SSL */
 
 
-#ifdef HAVE_SSL
 /*
  * 'http_shutdown_ssl()' - Shut down SSL/TLS on a connection.
  */

_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit
[prev in list] [next in list] [prev in thread] [next in thread]