[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  17436ce532fba87c07d02ca99d59ddaa65865862 (commit)
      from  71a04cfca03bf6d5a93ad3ffd23e0fb9e0da2919 (commit)


- Log -----------------------------------------------------------------
commit 17436ce532fba87c07d02ca99d59ddaa65865862
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Feb 26 08:57:06 2016 +0100

    Normalise the include directives in ct_test.c
    
    build.info needed a slight update, one more include directory.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/build.info |  2 +-
 test/ct_test.c  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/build.info b/test/build.info
index e3b0ee4..4101b5e 100644
--- a/test/build.info
+++ b/test/build.info
@@ -204,7 +204,7 @@ INCLUDE[dtlsv1listentest]={- rel2abs(catdir($builddir,"../include")) -} .. ../in
 DEPEND[dtlsv1listentest]=../libssl
 
 SOURCE[ct_test]=ct_test.c
-INCLUDE[ct_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
+INCLUDE[ct_test]={- rel2abs(catdir($builddir,"../include")) -} ../crypto/include ../include
 DEPEND[ct_test]=../libcrypto
 
 SOURCE[threadstest]=threadstest.c
diff --git a/test/ct_test.c b/test/ct_test.c
index cc01b13..dd0d8d2 100644
--- a/test/ct_test.c
+++ b/test/ct_test.c
@@ -58,12 +58,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "crypto/include/internal/ct_int.h"
-#include "openssl/err.h"
-#include "openssl/safestack.h"
-#include "openssl/ssl.h"
-#include "openssl/x509.h"
-#include "openssl/x509v3.h"
+#include "internal/ct_int.h"
+#include <openssl/err.h>
+#include <openssl/safestack.h>
+#include <openssl/ssl.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
 #include "testutil.h"
 
 #if !defined(OPENSSL_NO_CT) && !defined(OPENSSL_NO_UNIT_TEST)