Module Name:    src
Committed By:   agc
Date:           Thu Nov  4 07:03:41 UTC 2010

Modified Files:
        src/crypto/external/bsd/netpgp/dist/src/lib: symmetric.c

Log Message:
autoconf guard for <openssl/camellia.h>


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
    src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.13 src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.14
--- src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.13	Thu Nov  4 06:45:28 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c	Thu Nov  4 07:03:41 2010
@@ -54,7 +54,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: symmetric.c,v 1.13 2010/11/04 06:45:28 agc Exp $");
+__RCSID("$NetBSD: symmetric.c,v 1.14 2010/11/04 07:03:41 agc Exp $");
 #endif
 
 #include "crypto.h"
@@ -78,7 +78,9 @@
 #include <openssl/des.h>
 #endif
 
+#ifdef HAVE_OPENSSL_CAMELLIA_H
 #include <openssl/camellia.h>
+#endif
 
 #include "crypto.h"
 #include "netpgpdefs.h"

Reply via email to