diff options
| author | Steve Peters <steve@fisharerojo.org> | 2006-08-16 13:11:15 +0000 |
|---|---|---|
| committer | Steve Peters <steve@fisharerojo.org> | 2006-08-16 13:11:15 +0000 |
| commit | 87d46f97c572fcb76df491a3f99f2a7106164f04 (patch) | |
| tree | 96e36fd06c388250302dcbfeb11bc3513d60bd9c /ext/DB_File/DB_File.xs | |
| parent | 383f9357ddd20f0f467e21ca2ed7c8bc462aa3b6 (diff) | |
| download | perl-87d46f97c572fcb76df491a3f99f2a7106164f04.tar.gz | |
Additional changes to get C++ a little closer to a clean compile
of Perl.
p4raw-id: //depot/perl@28729
Diffstat (limited to 'ext/DB_File/DB_File.xs')
| -rw-r--r-- | ext/DB_File/DB_File.xs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/DB_File/DB_File.xs b/ext/DB_File/DB_File.xs index 8f4cb2fe7c..7cbe5e8d6c 100644 --- a/ext/DB_File/DB_File.xs +++ b/ext/DB_File/DB_File.xs @@ -410,12 +410,12 @@ typedef struct { typedef DB_File_type * DB_File ; typedef DBT DBTKEY ; -#define my_sv_setpvn(sv, d, s) sv_setpvn(sv, (s ? d : (void*)""), s) +#define my_sv_setpvn(sv, d, s) sv_setpvn(sv, (s ? d : (const char *)""), s) #define OutputValue(arg, name) \ { if (RETVAL == 0) { \ SvGETMAGIC(arg) ; \ - my_sv_setpvn(arg, name.data, name.size) ; \ + my_sv_setpvn(arg, (const char *)name.data, name.size) ; \ TAINT; \ SvTAINTED_on(arg); \ SvUTF8_off(arg); \ @@ -428,7 +428,7 @@ typedef DBT DBTKEY ; { \ SvGETMAGIC(arg) ; \ if (db->type != DB_RECNO) { \ - my_sv_setpvn(arg, name.data, name.size); \ + my_sv_setpvn(arg, (const char *)name.data, name.size); \ } \ else \ sv_setiv(arg, (I32)*(I32*)name.data - 1); \ @@ -597,8 +597,8 @@ const DBT * key2 ; PUSHMARK(SP) ; EXTEND(SP,2) ; - PUSHs(sv_2mortal(newSVpvn(data1,key1->size))); - PUSHs(sv_2mortal(newSVpvn(data2,key2->size))); + PUSHs(sv_2mortal(newSVpvn((const char*)data1,key1->size))); + PUSHs(sv_2mortal(newSVpvn((const char*)data2,key2->size))); PUTBACK ; count = perl_call_sv(CurrentDB->compare, G_SCALAR); |