From 6a86cd362b2b952c9a819dea1df43efd3fd8bab3 Mon Sep 17 00:00:00 2001 From: Kevin Rosenberg Date: Thu, 10 Dec 2009 07:08:35 -0700 Subject: [PATCH] Fix for time.lisp's roll function --- ChangeLog | 4 ++++ db-mysql/Makefile.msvc | 18 +++++++++--------- db-mysql/clsql_mysql.lib | Bin 3452 -> 0 bytes sql/time.lisp | 5 ++--- 4 files changed, 15 insertions(+), 12 deletions(-) mode change 100644 => 100755 db-mysql/Makefile.msvc delete mode 100644 db-mysql/clsql_mysql.lib diff --git a/ChangeLog b/ChangeLog index 16b1adf..a741db9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +10 Dec 2009 Kevin Rosenberg + * sql/time.lisp: Patch from Oleg Tihonov to roll function + to properly use USEC argument. + 21 Nov 2009 Kevin Rosenberg * Version 4.1.2 * Makefiles: On 64-bit Linux systems, try to build both 32 and 64-bit diff --git a/db-mysql/Makefile.msvc b/db-mysql/Makefile.msvc old mode 100644 new mode 100755 index a692f4c..c2767ba --- a/db-mysql/Makefile.msvc +++ b/db-mysql/Makefile.msvc @@ -9,7 +9,7 @@ # # CVS Id: $Id: Makefile.msvc,v 1.1 2002/09/18 07:43:40 kevin Exp $ # -# This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg +# This file, part of CLSQL, is Copyright (c) 2002-2009 by Kevin M. Rosenberg # # CLSQL users are granted the rights to distribute and use this software # as governed by the terms of the Lisp Lesser GNU Public License @@ -20,23 +20,23 @@ BASE=clsql_mysql # Set to the directory where you have installed mysql's library -MYSQL_DIR=c:/mysql - -MYSQL_LIB_DIR=$(MYSQL_DIR)/lib/opt -MYSQL_LIB_FILE=$(MYSQL_LIB_DIR)/Libmysql.lib -MYSQL_INCLUDE=$(MYSQL_DIR)/include +MYSQL_DIR=c:/Program Files/MySQL/MySQL Server 5.1/ +MYSQL_LIB_FILE=$(MYSQL_DIR)lib\opt\mysqlclient.lib +MYSQL_INCLUDE=$(MYSQL_DIR)include # Nothing to configure beyond here SRC=$(BASE).c OBJ=$(BASE).obj DLL=$(BASE).dll +LIB=$(BASE).lib + $(DLL): $(SRC) $(MYSQL_LIB_FILE) - cl /MD /LD -D_MT /DWIN32=1 /D__LCC__=1 /I$(MYSQL_INCLUDE) $(SRC) $(MYSQL_LIB_FILE) + echo "LD" + echo $(MYSQL_LIB_FILE) + cl /MD /LD -D_MT /DWIN32=1 /D__LCC__=1 /I"$(MYSQL_INCLUDE)" $(SRC) $(MYSQL_LIB_FILE) del $(OBJ) $(BASE).exp clean: del /q $(DLL) - - diff --git a/db-mysql/clsql_mysql.lib b/db-mysql/clsql_mysql.lib deleted file mode 100644 index 0a2a75b74851219e51820933bc0e170e45b72f8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3452 zcmcInTTc@~6#m*$dL?PZH=`*Allp?tyTp*9m`Esvl#=j(S!%n5#$K>3QJ(w*KJm!2 zzk&G3Gx5Phe*oc!h-Y?pc4u#;71(5UcFvhI-<&hwnVFq=RqfRdmclRM=4W9(pH1cR z`Bc&@pVyk%dH%H*1~3iy7lFVo5Ih0GJ8GGV0<46t)Dk@fl#-yDO5{u};S1_dC9=ed zB(1J*Zj>w1%G<3s<<-r~Mp8(#mpWnff=|hmurl zk+C|2RId)IQeT!o!cAWt_|e6gPBETw{3R%a&I6t>t;AX zY`1ANV)v2}}tyH<2RZH&d4-TBrxW>)0UHu~QKH|!#a}~5>b8^Ap zWQ0h$=m&NKz)29;A(lp`fU6L2N{mcUIipS&BwwPM2n-Lrn8XCah#-U@0`S|~KH}8a z>~x^vjVus&>J~^IL^r(KGeCh$>R!2G$^FRO`()xcjWms~(~0r7J$ z)iL5bdqTQX2~5W*b-+erPk`+G(Fg0zTCdyhHU{xT`FXs!T3S=pmNzArV#!7TWfZfI z(VG&IzH|^2YTfoBP1GNKkLzoW#`?2|&CCn#Zvjx|dcY-$XKa2xE=jXKB!J#0V@R0% z343V|8y(1LEmnC^qW6E~_Z=}LnSLoS#H%pmhcYiVJ7r#*pv4q1B8b z_p$P$tmtE!gX>8i*4Z&)UL|uGA!=$~{UHQ(eVwB=B(E|&P>h8vuf#{lt2CFhe!qA_ ztM4+pqeS!(;kuA;?09B!S~%nEX2-I!=wW-+GsU-{`NTKx>iW`QeAJXP>I|WJXpeNc ztlb8YZ^srtX9>}3MKqm72B`iuB3HBgf?~m>t1#_i7B6l0Asx-wK}W>Rq@APtlyE1U uah3D)eh~f6h|0-)3&bG|nzSMsXTAYAK4