| timbo@cvs.perl.org 2005-06-03, 8:27 pm |
| Author: timbo
Date: Mon Oct 18 15:58:06 2004
New Revision: 497
Modified:
dbd-oracle/trunk/dbdimp.h
Log:
Add handy CSFORM_IMPLIES_UTF8(
csform) macro
Modified: dbd-oracle/trunk/dbdimp.h
====================
====================
====================
==================
--- dbd-oracle/trunk/dbdimp.h (original)
+++ dbd-oracle/trunk/dbdimp.h Mon Oct 18 15:58:06 2004
@@ -251,16 +251,13 @@
csid = charsetid; \
} \
}
-/* XXX UTF8_FIXUP_CSID is disabled for now
-OK... I rewrote this (above) to make it much more targeted... by checking csform
-and turned it back on... it _IS_ necessary (atleast in 9.2)
-#undef UTF8_FIXUP_CSID
-#define UTF8_FIXUP_CSID(csid
,where) 0
-*/
-#define DBD_SET_UTF8_FORM(sv
,csform) \
- ( ( (csform!=SQLCS_NCHAR
&& CS_IS_UTF8( charsetid)) \
- ||(csform==SQLCS_NCH
AR && CS_IS_UTF8(ncharseti
d)) ) ? SvUTF8_on(sv) : 0 )
+#define CSFORM_IMPLIES_UTF8(
csform) \
+ ( (csform!=SQLCS_NCHAR
&& CS_IS_UTF8( charsetid)) \
+ || (csform==SQLCS_NCHAR
&& CS_IS_UTF8(ncharseti
d)) )
+
+#define DBD_SET_UTF8_FORM(sv
,csform) \
+ (CSFORM_IMPLIES_UTF8
(csform) ? SvUTF8_on(sv) : 0)
#else /* UTF8_SUPPORT */
#define DBD_SET_UTF8_FORM(sv
,csform) 0
|