version git diff fix

This commit is contained in:
kaleb-himes
2015-01-27 11:42:25 -07:00
parent d6d56c8532
commit 14eaa69eae
2 changed files with 22 additions and 45 deletions

View File

@@ -1848,7 +1848,6 @@ echo
#backwards compatability for those who have included options or version #backwards compatability for those who have included options or version
touch cyassl/options.h touch cyassl/options.h
touch cyassl/version.h
echo "/* cyassl options.h" > cyassl/options.h echo "/* cyassl options.h" > cyassl/options.h
echo " * generated from wolfssl/options.h" >> cyassl/options.h echo " * generated from wolfssl/options.h" >> cyassl/options.h
echo " */\n" >> cyassl/options.h echo " */\n" >> cyassl/options.h
@@ -1857,15 +1856,6 @@ do
echo "$line" >> cyassl/options.h echo "$line" >> cyassl/options.h
done < $OPTION_FILE done < $OPTION_FILE
echo "/* cyassl version.h" > cyassl/version.h
echo " * generated from wolfssl version.h" >> cyassl/version.h
echo " */\n" >> cyassl/version.h
while read -r line
do
echo "$line" >> cyassl/version.h
done < wolfssl/version.h
#end backwards compatibility
# output config summary # output config summary
echo "---" echo "---"
echo "Configuration summary for $PACKAGE_NAME version $VERSION" echo "Configuration summary for $PACKAGE_NAME version $VERSION"

View File

@@ -1,8 +1,4 @@
/* cyassl version.h /* cyassl/version.h
* generated from wolfssl version.h
*/
/* wolfssl_version.h.in
* *
* Copyright (C) 2006-2015 wolfSSL Inc. * Copyright (C) 2006-2015 wolfSSL Inc.
* *
@@ -23,17 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <wolfssl/version.h>
#pragma once #define LIBCYASSL_VERSION_STRING LIBWOLFSSL_VERSION_STRING
#define LIBCYASSL_VERSION_HEX LIBWOLFSSL_VERSION_HEX
#ifdef __cplusplus
extern "C" {
#endif
#define LIBWOLFSSL_VERSION_STRING "3.3.4"
#define LIBWOLFSSL_VERSION_HEX 0x03003004
#ifdef __cplusplus
}
#endif