X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=objpp.h;h=44e105efa4a82a527858791b3a304a6c0a4643c3;hb=d1541cac9dfa01652e1484ccbb55364281121bb4;hp=9e701ff2eb3fec3b580323e3b46be453a281491b;hpb=9d8a25dc64d23dcd5730db9be0dbe94a107e1f8b;p=p5sagit%2Fp5-mst-13.2.git diff --git a/objpp.h b/objpp.h index 9e701ff..44e105e 100644 --- a/objpp.h +++ b/objpp.h @@ -85,6 +85,10 @@ #define block_gimme CPerlObj::Perl_block_gimme #undef block_start #define block_start CPerlObj::Perl_block_start +#undef bset_obj_store +#define bset_obj_store CPerlObj::Perl_bset_obj_store +#undef byterun +#define byterun CPerlObj::Perl_byterun #undef call_list #define call_list CPerlObj::Perl_call_list #undef cando @@ -245,6 +249,8 @@ #define do_aexec CPerlObj::Perl_do_aexec #undef do_aspawn #define do_aspawn CPerlObj::do_aspawn +#undef do_binmode +#define do_binmode CPerlObj::Perl_do_binmode #undef do_chop #define do_chop CPerlObj::Perl_do_chop #undef do_close @@ -319,6 +325,8 @@ #define dump_form CPerlObj::Perl_dump_form #undef dump_gv #define dump_gv CPerlObj::Perl_dump_gv +#undef dump_mstats +#define dump_mstats CPerlObj::Perl_dump_mstats #undef dump_op #define dump_op CPerlObj::Perl_dump_op #undef dump_pm @@ -343,6 +351,8 @@ #define filter_read CPerlObj::Perl_filter_read #undef find_beginning #define find_beginning CPerlObj::find_beginning +#undef find_script +#define find_script CPerlObj::Perl_find_script #undef forbid_setid #define forbid_setid CPerlObj::forbid_setid #undef force_ident @@ -371,6 +381,10 @@ #define get_op_descs CPerlObj::Perl_get_op_descs #undef get_op_names #define get_op_names CPerlObj::Perl_get_op_names +#undef get_no_modify +#define get_no_modify CPerlObj::Perl_get_no_modify +#undef get_opargs +#define get_opargs CPerlObj::Perl_get_opargs #undef getlogin #define getlogin CPerlObj::getlogin #undef gp_free @@ -563,14 +577,20 @@ #define magic_getpack CPerlObj::Perl_magic_getpack #undef magic_getglob #define magic_getglob CPerlObj::Perl_magic_getglob +#undef magic_getnkeys +#define magic_getnkeys CPerlObj::Perl_magic_getnkeys #undef magic_getpos #define magic_getpos CPerlObj::Perl_magic_getpos #undef magic_getsig #define magic_getsig CPerlObj::Perl_magic_getsig +#undef magic_getsubstr +#define magic_getsubstr CPerlObj::Perl_magic_getsubstr #undef magic_gettaint #define magic_gettaint CPerlObj::Perl_magic_gettaint #undef magic_getuvar #define magic_getuvar CPerlObj::Perl_magic_getuvar +#undef magic_getvec +#define magic_getvec CPerlObj::Perl_magic_getvec #undef magic_len #define magic_len CPerlObj::Perl_magic_len #undef magic_methcall @@ -692,7 +712,9 @@ #undef my_lstat #define my_lstat CPerlObj::Perl_my_lstat #undef my_memcmp -#define my_memcmp CPerlObj::my_memcmp +#define my_memcmp CPerlObj::Perl_my_memcmp +#undef my_memset +#define my_memset CPerlObj::Perl_my_memset #undef my_pclose #define my_pclose CPerlObj::Perl_my_pclose #undef my_popen @@ -721,6 +743,8 @@ #define newASSIGNOP CPerlObj::Perl_newASSIGNOP #undef newCONDOP #define newCONDOP CPerlObj::Perl_newCONDOP +#undef newCONSTSUB +#define newCONSTSUB CPerlObj::Perl_newCONSTSUB #undef newDEFSVOP #define newDEFSVOP CPerlObj::newDEFSVOP #undef newFORM @@ -787,8 +811,6 @@ #define Perl_newRV_noinc CPerlObj::Perl_newRV_noinc #undef newSV #define newSV CPerlObj::Perl_newSV -#undef newSV -#define newSV CPerlObj::Perl_newSV #undef newSVREF #define newSVREF CPerlObj::Perl_newSVREF #undef newSVOP @@ -799,18 +821,22 @@ #define newSVnv CPerlObj::Perl_newSVnv #undef newSVpv #define newSVpv CPerlObj::Perl_newSVpv -#undef newSVrv -#define newSVrv CPerlObj::Perl_newSVrv -#undef newSVsv -#define newSVsv CPerlObj::Perl_newSVsv #undef newSVpvf #define newSVpvf CPerlObj::Perl_newSVpvf #undef newSVpvn #define newSVpvn CPerlObj::Perl_newSVpvn +#undef newSVrv +#define newSVrv CPerlObj::Perl_newSVrv +#undef newSVsv +#define newSVsv CPerlObj::Perl_newSVsv #undef newUNOP #define newUNOP CPerlObj::Perl_newUNOP #undef newWHILEOP #define newWHILEOP CPerlObj::Perl_newWHILEOP +#undef new_logop +#define new_logop CPerlObj::new_logop +#undef new_stackinfo +#define new_stackinfo CPerlObj::Perl_new_stackinfo #undef new_sv #define new_sv CPerlObj::new_sv #undef new_xiv @@ -845,6 +871,8 @@ #define pad_allocmy CPerlObj::Perl_pad_allocmy #undef pad_findmy #define pad_findmy CPerlObj::Perl_pad_findmy +#undef op_const_sv +#define op_const_sv CPerlObj::Perl_op_const_sv #undef op_free #define op_free CPerlObj::Perl_op_free #undef oopsCV @@ -1009,6 +1037,8 @@ #define regtail CPerlObj::regtail #undef regtry #define regtry CPerlObj::regtry +#undef regwhite +#define regwhite CPerlObj::regwhite #undef repeatcpy #define repeatcpy CPerlObj::Perl_repeatcpy #undef restore_expect @@ -1049,6 +1079,8 @@ #define savepvn CPerlObj::Perl_savepvn #undef savestack_grow #define savestack_grow CPerlObj::Perl_savestack_grow +#undef save_aelem +#define save_aelem CPerlObj::Perl_save_aelem #undef save_aptr #define save_aptr CPerlObj::Perl_save_aptr #undef save_ary @@ -1071,6 +1103,8 @@ #define save_hash CPerlObj::Perl_save_hash #undef save_hek #define save_hek CPerlObj::save_hek +#undef save_helem +#define save_helem CPerlObj::Perl_save_helem #undef save_hptr #define save_hptr CPerlObj::Perl_save_hptr #undef save_I16 @@ -1420,7 +1454,7 @@ #define more_he CPerlObj::more_he #define del_he CPerlObj::del_he -#ifdef WIN32 +#if defined(WIN32) && !defined(WIN32IO_IS_STDIO) #undef errno #define errno CPerlObj::ErrorNo()