From fa847863953bc9451403a8073e1166ea25d2a97b Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 14 Dec 2014 14:42:06 +0000
Subject: unifdef OPENSSL_NO_NEXTPROTONEG

---
 src/usr.bin/openssl/apps.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/usr.bin/openssl/apps.h')

diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h
index d6b18e2a35..b2b7e85107 100644
--- a/src/usr.bin/openssl/apps.h
+++ b/src/usr.bin/openssl/apps.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.h,v 1.8 2014/11/07 14:16:48 jsing Exp $ */
+/* $OpenBSD: apps.h,v 1.9 2014/12/14 14:42:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -245,9 +245,7 @@ int do_X509_REQ_sign(BIO *err, X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md,
 int do_X509_CRL_sign(BIO *err, X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md,
     STACK_OF(OPENSSL_STRING) *sigopts);
 
-#if !defined(OPENSSL_NO_NEXTPROTONEG)
 unsigned char *next_protos_parse(unsigned short *outlen, const char *in);
-#endif  /* !OPENSSL_NO_NEXTPROTONEG */
 
 #define FORMAT_UNDEF    0
 #define FORMAT_ASN1     1
-- 
cgit v1.2.3-55-g6feb