Commit a3f4ae39 authored by unknown's avatar unknown

Bug#13957 yassl: opensrv6c compile failure

 - Added some ifdefs and turn off auto template instantiation, use explicit template instantiation


configure.in:
  Use -Tno_implict to indicate that we specifiy which template should be instantiated.
  Turn on HAVE_EXPLICIT_TEMPLATE_INSTATNTIATION
extra/yassl/src/socket_wrapper.cpp:
  Include sys/filio.h if __SCO_VERSION__ is defined
extra/yassl/src/timer.cpp:
  Dont' include files from within namespace yaSSL.
parent e6b02a69
...@@ -334,6 +334,10 @@ case "$target_os" in ...@@ -334,6 +334,10 @@ case "$target_os" in
# Use the built-in alloca() # Use the built-in alloca()
CFLAGS="$CFLAGS -Kalloca" CFLAGS="$CFLAGS -Kalloca"
CXXFLAGS="$CFLAGS -Kalloca" CXXFLAGS="$CFLAGS -Kalloca"
# Use no_implicit for templates
CXXFLAGS="$CXXFLAGS -Tno_implicit"
AC_DEFINE([HAVE_EXPLICIT_TEMPLATE_INSTANTIATION],
[1], [Defined by configure. Use explicit template instantiation.])
fi fi
;; ;;
esac esac
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <string.h> #include <string.h>
#endif // _WIN32 #endif // _WIN32
#ifdef __sun #if defined(__sun) || defined(__SCO_VERSION__)
#include <sys/filio.h> #include <sys/filio.h>
#endif #endif
......
...@@ -26,13 +26,17 @@ ...@@ -26,13 +26,17 @@
#include "runtime.hpp" #include "runtime.hpp"
#include "timer.hpp" #include "timer.hpp"
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#else
#include <sys/time.h>
#endif
namespace yaSSL { namespace yaSSL {
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
timer_d timer() timer_d timer()
{ {
static bool init(false); static bool init(false);
...@@ -57,8 +61,6 @@ namespace yaSSL { ...@@ -57,8 +61,6 @@ namespace yaSSL {
#else // _WIN32 #else // _WIN32
#include <sys/time.h>
timer_d timer() timer_d timer()
{ {
struct timeval tv; struct timeval tv;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment