diff options
| author | svoj@mysql.com <> | 2005-06-15 22:43:44 +0500 |
|---|---|---|
| committer | svoj@mysql.com <> | 2005-06-15 22:43:44 +0500 |
| commit | c7f9c0d871ef79cd8ed3b0e3241f7a02507c0224 (patch) | |
| tree | cb87781caed5fdd88b5ac1d84797faad11346bc2 | |
| parent | ff0b7e4d73925572af8b33513aec2153b185091c (diff) | |
| parent | 39f7bc6767b95fb0075b4ef284243e83b504f5a4 (diff) | |
| download | mariadb-git-c7f9c0d871ef79cd8ed3b0e3241f7a02507c0224.tar.gz | |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
| -rw-r--r-- | extra/yassl/taocrypt/src/misc.cpp | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/extra/yassl/taocrypt/src/misc.cpp b/extra/yassl/taocrypt/src/misc.cpp index 6d43273ef20..3ec4502ed57 100644 --- a/extra/yassl/taocrypt/src/misc.cpp +++ b/extra/yassl/taocrypt/src/misc.cpp @@ -136,7 +136,7 @@ unsigned long Crop(unsigned long value, unsigned int size) #if !(defined(_MSC_VER) && (_MSC_VER < 1300)) && \ - !(defined(__HP_aCC) && (__HP_aCC <= 35700)) + !(defined(__HP_aCC) && (__HP_aCC <= 36300)) using std::new_handler; using std::set_new_handler; #endif diff --git a/tools/Makefile.am b/tools/Makefile.am index 036f0b8a76e..651ef2d22b3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -15,13 +15,18 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Process this file with automake to create Makefile.in +if HAVE_YASSL + yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp +else + yassl_dummy_link_fix= +endif INCLUDES=-I$(top_srcdir)/include $(openssl_includes) \ -I$(top_builddir)/include LDADD= @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/libmysql_r/libmysqlclient_r.la \ @openssl_libs@ @ZLIB_LIBS@ bin_PROGRAMS= mysqltestmanager -mysqltestmanager_SOURCES= mysqlmanager.c +mysqltestmanager_SOURCES= mysqlmanager.c $(yassl_dummy_link_fix) mysqltestmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) DEF= -DUNDEF_THREADS_HACK |