Author: timbo
Date: Mon Mar 10 13:56:53 2008
New Revision: 10902
Modified:
dbi/trunk/DBI.xs
dbi/trunk/dbixs_rev.h
Log:
More sprintf changes, this time for a threaded build.
Modified: dbi/trunk/DBI.xs
==============================================================================
--- dbi/trunk/DBI.xs (original)
+++ dbi/trunk/DBI.xs Mon Mar 10 13:56:53 2008
@@ -949,7 +949,7 @@
if (DBIS_TRACE_LEVEL >= 3)
PerlIO_printf(DBILOGFP," dbih_make_com(%s, %p, %s, %ld, %p)
thr#%p\n",
- neatsvpv(p_h,0), (void*)p_imp_xxh, imp_class, (long)imp_size,
(void*)imp_templ, PERL_GET_THX);
+ neatsvpv(p_h,0), (void*)p_imp_xxh, imp_class, (long)imp_size,
(void*)imp_templ, (void*)PERL_GET_THX);
if (imp_templ && SvOK(imp_templ)) {
U32 imp_templ_flags;
@@ -1287,7 +1287,7 @@
if (DBIc_THR_USER(imp_xxh) != my_perl) { /* don't clear handle that
belongs to another thread */
if (debug >= 3) {
PerlIO_printf(DBILOGFP," skipped dbih_clearcom: DBI handle
(type=%d, %s) is owned by thread %p not current thread %p\n",
- DBIc_TYPE(imp_xxh), HvNAME(DBIc_IMP_STASH(imp_xxh)),
DBIc_THR_USER(imp_xxh), my_perl) ;
+ DBIc_TYPE(imp_xxh), HvNAME(DBIc_IMP_STASH(imp_xxh)),
(void*)DBIc_THR_USER(imp_xxh), (void*)my_perl) ;
PerlIO_flush(DBILOGFP);
}
return;
@@ -2781,7 +2781,7 @@
if (trace_level >= 2) {
PerlIO_printf(DBILOGFP," DESTROY ignored because DBI %sh
handle (%s) is owned by thread %p not current thread %p\n",
dbih_htype_name(DBIc_TYPE(imp_xxh)),
HvNAME(DBIc_IMP_STASH(imp_xxh)),
- (PerlInterpreter *)DBIc_THR_USER(imp_xxh), my_perl) ;
+ (void*)DBIc_THR_USER(imp_xxh), (void*)my_perl) ;
PerlIO_flush(DBILOGFP);
}
XSRETURN(0); /* don't DESTROY handle, if it is not our's !*/
@@ -3093,7 +3093,7 @@
(ima && i==ima->hidearg) ? "****" : neatsvpv(ST(i),0));
}
#ifdef DBI_USE_THREADS
- PerlIO_printf(logfp, ") thr#%p\n", DBIc_THR_USER(imp_xxh));
+ PerlIO_printf(logfp, ") thr#%p\n", (void*)DBIc_THR_USER(imp_xxh));
#else
PerlIO_printf(logfp, ")\n");
#endif
Modified: dbi/trunk/dbixs_rev.h
==============================================================================
--- dbi/trunk/dbixs_rev.h (original)
+++ dbi/trunk/dbixs_rev.h Mon Mar 10 13:56:53 2008
@@ -1,4 +1,4 @@
-/* Mon Mar 10 11:57:28 2008 */
-/* Mixed revision working copy (10706M:10720) */
+/* Mon Mar 10 14:00:00 2008 */
+/* Mixed revision working copy (10706M:10899) */
/* Code modified since last checkin */
#define DBIXS_REVISION 10706
