Commit f38c7bfd authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/bug13957/my50-bug13957


configure.in:
  Auto merged
parents 096f181d f8aa1db3

configure.in

+4 −0
Original line number Diff line number Diff line
@@ -334,6 +334,10 @@ case "$target_os" in 
      # Use the built-in alloca()

      CFLAGS="$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

  ;;

esac

extra/yassl/src/socket_wrapper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
    #include <string.h>

#endif // _WIN32



#ifdef __sun

#if defined(__sun) || defined(__SCO_VERSION__)

    #include <sys/filio.h>

#endif

extra/yassl/src/timer.cpp

+7 −5
Original line number Diff line number Diff line
@@ -26,12 +26,16 @@ 
#include "runtime.hpp"

#include "timer.hpp"



namespace yaSSL {



#ifdef _WIN32



#define WIN32_LEAN_AND_MEAN

#include <windows.h>

#else

#include <sys/time.h>

#endif



namespace yaSSL {



#ifdef _WIN32



    timer_d timer()

    {
@@ -57,8 +61,6 @@ namespace yaSSL { 


#else // _WIN32



    #include <sys/time.h>



    timer_d timer()

    {

        struct timeval tv;