MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:msvensson Date:November 3 2005 9:37am
Subject:bk commit into 5.0 tree (msvensson:1.1958) BUG#13957
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1958 05/11/03 10:37:49 msvensson@neptunus.(none) +3 -0
  Bug#13957 yassl: opensrv6c compile failure
   - Added some ifdefs and turn off auto template instantiation, use explicit template instantiation

  extra/yassl/src/timer.cpp
    1.5 05/11/03 10:37:41 msvensson@neptunus.(none) +7 -5
    Dont' include files from within namespace yaSSL.

  extra/yassl/src/socket_wrapper.cpp
    1.7 05/11/03 10:37:41 msvensson@neptunus.(none) +1 -1
    Include sys/filio.h if __SCO_VERSION__ is defined

  configure.in
    1.360 05/11/03 10:37:41 msvensson@neptunus.(none) +4 -0
    Use -Tno_implict to indicate that we specifiy which template should be instantiated.
    Turn on HAVE_EXPLICIT_TEMPLATE_INSTATNTIATION

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug13957/my50-bug13957

--- 1.359/configure.in	2005-10-28 11:41:27 +02:00
+++ 1.360/configure.in	2005-11-03 10:37:41 +01:00
@@ -334,6 +334,10 @@
       # 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

--- 1.6/extra/yassl/src/socket_wrapper.cpp	2005-09-01 11:46:37 +02:00
+++ 1.7/extra/yassl/src/socket_wrapper.cpp	2005-11-03 10:37:41 +01:00
@@ -39,7 +39,7 @@
     #include <string.h>
 #endif // _WIN32
 
-#ifdef __sun
+#if defined(__sun) || defined(__SCO_VERSION__)
     #include <sys/filio.h>
 #endif
 

--- 1.4/extra/yassl/src/timer.cpp	2005-07-01 17:00:54 +02:00
+++ 1.5/extra/yassl/src/timer.cpp	2005-11-03 10:37:41 +01:00
@@ -26,13 +26,17 @@
 #include "runtime.hpp"
 #include "timer.hpp"
 
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#else
+#include <sys/time.h>
+#endif
+
 namespace yaSSL {
 
 #ifdef _WIN32
 
-    #define WIN32_LEAN_AND_MEAN
-    #include <windows.h>
-
     timer_d timer()
     {
         static bool          init(false);
@@ -56,8 +60,6 @@
     }
 
 #else // _WIN32
-
-    #include <sys/time.h>
 
     timer_d timer()
     {
Thread
bk commit into 5.0 tree (msvensson:1.1958) BUG#13957msvensson3 Nov