===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/apps.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src/usr.bin/openssl/apps.c	2014/10/16 10:43:54	1.11
+++ src/usr.bin/openssl/apps.c	2014/11/07 14:16:48	1.12
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.c,v 1.11 2014/10/16 10:43:54 jsing Exp $ */
+/* $OpenBSD: apps.c,v 1.12 2014/11/07 14:16:48 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -2163,7 +2163,7 @@
 		BIO_free(out);
 }
 
-#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+#if !defined(OPENSSL_NO_NEXTPROTONEG)
 /* next_protos_parse parses a comma separated list of strings into a string
  * in a format suitable for passing to SSL_CTX_set_next_protos_advertised.
  *   outlen: (output) set to the length of the resulting buffer on success.
@@ -2203,7 +2203,7 @@
 	return out;
 }
 #endif
-/* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */
+/* !OPENSSL_NO_NEXTPROTONEG */
 
 double
 app_tminterval(int stop, int usertime)