| timbo@cvs.perl.org 2005-06-03, 8:27 pm |
| Author: timbo
Date: Tue Oct 19 14:42:47 2004
New Revision: 504
Modified:
dbd-oracle/trunk/Makefile.PL
dbd-oracle/trunk/dbdimp.h
Log:
UTF8_FIXUP_CSID no longer needed.
Loosen UTF8_SUPPORT scope
Modified: dbd-oracle/trunk/Makefile.PL
====================
====================
====================
==================
Modified: dbd-oracle/trunk/dbdimp.h
====================
====================
====================
==================
--- dbd-oracle/trunk/dbdimp.h (original)
+++ dbd-oracle/trunk/dbdimp.h Tue Oct 19 14:42:47 2004
@@ -217,7 +217,6 @@
extern int ora_fetchtest;
-#ifdef UTF8_SUPPORT
extern ub2 charsetid;
extern ub2 ncharsetid;
extern ub2 utf8_csid;
@@ -229,26 +228,12 @@
#define CS_IS_UTF16( cs ) ( cs == al16utf16_csid )
-#define UTF8_FIXUP_CSID( csid ,csform ,where ) \
- if ( (CS_IS_UTF8(csid) || CS_IS_UTF16(csid)) && (csid != ncharsetid) ) { \
- ub2 new_csid = ( csform == SQLCS_NCHAR ) ? ncharsetid : charsetid; \
- if (DBIS->debug >= 3) \
- PerlIO_printf(DBILOG
FP, " csform %d so changing csid %d (UTF) to %d (in %s)\n", \
- csform, csid, new_csid, where ); \
- csid = new_csid; \
- }
-
#define CSFORM_IMPLIED_CSID(
csform) \
((csform==SQLCS_NCHA
R) ? ncharsetid : charsetid)
#define CSFORM_IMPLIES_UTF8(
csform) \
CS_IS_UTF8( CSFORM_IMPLIED_CSID(
csform ) )
-#else /* UTF8_SUPPORT */
-#define UTF8_FIXUP_CSID(csid
,csform,where)
-#endif /* UTF8_SUPPORT */
-
-
void dbd_init_oci _((dbistate_t *dbistate));
void dbd_preparse _((imp_sth_t *imp_sth, char *statement));
|