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
touch cyassl/options.h
touch cyassl/version.h
echo "/* cyassl options.h" > cyassl/options.h
echo " * generated from wolfssl/options.h" >> cyassl/options.h
echo " */\n" >> cyassl/options.h
@ -1857,15 +1856,6 @@ do
echo "$line" >> cyassl/options.h
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
echo "---"
echo "Configuration summary for $PACKAGE_NAME version $VERSION"

View File

@ -1,39 +1,26 @@
/* cyassl version.h
* generated from wolfssl version.h
/* cyassl/version.h
*
* Copyright (C) 2006-2015 wolfSSL Inc.
*
* This file is part of wolfSSL. (formerly known as CyaSSL)
*
* wolfSSL is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* wolfSSL is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* wolfssl_version.h.in
*
* Copyright (C) 2006-2015 wolfSSL Inc.
*
* This file is part of wolfSSL. (formerly known as CyaSSL)
*
* wolfSSL is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* wolfSSL is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <wolfssl/version.h>
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
#define LIBWOLFSSL_VERSION_STRING "3.3.4"
#define LIBWOLFSSL_VERSION_HEX 0x03003004
#ifdef __cplusplus
}
#endif
#define LIBCYASSL_VERSION_STRING LIBWOLFSSL_VERSION_STRING
#define LIBCYASSL_VERSION_HEX LIBWOLFSSL_VERSION_HEX