X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=objpp.h;h=89551d4371fc72a83fe396b5f564e0d8fcab8778;hb=5081475eefaf24307ce7eaf4c87aafd588b37e98;hp=7a9cd2da61b8a49c1cad5548e7160ce0fe05085a;hpb=76e3520e1f6b7df33cd381a2cf4f1fce3d69c8a4;p=p5sagit%2Fp5-mst-13.2.git diff --git a/objpp.h b/objpp.h index 7a9cd2d..89551d4 100644 --- a/objpp.h +++ b/objpp.h @@ -51,30 +51,16 @@ #define av_unshift CPerlObj::Perl_av_unshift #undef avhv_keys #define avhv_keys CPerlObj::Perl_avhv_keys -#undef avhv_fetch -#define avhv_fetch CPerlObj::Perl_avhv_fetch #undef avhv_fetch_ent #define avhv_fetch_ent CPerlObj::Perl_avhv_fetch_ent -#undef avhv_store -#define avhv_store CPerlObj::Perl_avhv_store -#undef avhv_store_ent -#define avhv_store_ent CPerlObj::Perl_avhv_store_ent #undef avhv_exists_ent #define avhv_exists_ent CPerlObj::Perl_avhv_exists_ent -#undef avhv_exists -#define avhv_exists CPerlObj::Perl_avhv_exists -#undef avhv_delete -#define avhv_delete CPerlObj::Perl_avhv_delete -#undef avhv_delete_ent -#define avhv_delete_ent CPerlObj::Perl_avhv_delete_ent -#undef avhv_iterinit -#define avhv_iterinit CPerlObj::Perl_avhv_iterinit +#undef avhv_index_sv +#define avhv_index_sv CPerlObj::avhv_index_sv #undef avhv_iternext #define avhv_iternext CPerlObj::Perl_avhv_iternext #undef avhv_iterval #define avhv_iterval CPerlObj::Perl_avhv_iterval -#undef avhv_iternextsv -#define avhv_iternextsv CPerlObj::Perl_avhv_iternextsv #undef bad_type #define bad_type CPerlObj::bad_type #undef bind_match @@ -85,6 +71,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 @@ -163,6 +153,8 @@ #define ck_subr CPerlObj::Perl_ck_subr #undef ck_svconst #define ck_svconst CPerlObj::Perl_ck_svconst +#undef ck_sysread +#define ck_sysread CPerlObj::Perl_ck_sysread #undef ck_trunc #define ck_trunc CPerlObj::Perl_ck_trunc #undef convert @@ -245,6 +237,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 +313,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 +339,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 +369,12 @@ #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 get_specialsv_list +#define get_specialsv_list CPerlObj::Perl_get_specialsv_list #undef getlogin #define getlogin CPerlObj::getlogin #undef gp_free @@ -483,6 +487,8 @@ #define init_debugger CPerlObj::init_debugger #undef init_ids #define init_ids CPerlObj::init_ids +#undef init_interp +#define init_interp CPerlObj::init_interp #undef init_main_thread #define init_main_thread CPerlObj::init_main_thread #undef init_main_stash @@ -563,16 +569,24 @@ #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 +#define magic_methcall CPerlObj::magic_methcall #undef magic_methpack #define magic_methpack CPerlObj::magic_methpack #undef magic_nextpack @@ -619,10 +633,16 @@ #define magic_setuvar CPerlObj::Perl_magic_setuvar #undef magic_setvec #define magic_setvec CPerlObj::Perl_magic_setvec +#undef magic_sizepack +#define magic_sizepack CPerlObj::Perl_magic_sizepack +#undef magic_unchain +#define magic_unchain CPerlObj::Perl_magic_unchain #undef magic_wipepack #define magic_wipepack CPerlObj::Perl_magic_wipepack #undef magicname #define magicname CPerlObj::Perl_magicname +#undef malloced_size +#define malloced_size CPerlObj::Perl_malloced_size #undef markstack_grow #define markstack_grow CPerlObj::Perl_markstack_grow #undef markstack_ptr @@ -643,12 +663,14 @@ #define mg_free CPerlObj::Perl_mg_free #undef mg_get #define mg_get CPerlObj::Perl_mg_get -#undef mg_len -#define mg_len CPerlObj::Perl_mg_len +#undef mg_length +#define mg_length CPerlObj::Perl_mg_length #undef mg_magical #define mg_magical CPerlObj::Perl_mg_magical #undef mg_set #define mg_set CPerlObj::Perl_mg_set +#undef mg_size +#define mg_size CPerlObj::Perl_mg_size #undef missingterm #define missingterm CPerlObj::missingterm #undef mod @@ -686,11 +708,15 @@ #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 #define my_popen CPerlObj::Perl_my_popen +#undef my_safemalloc +#define my_safemalloc CPerlObj::my_safemalloc #undef my_setenv #define my_setenv CPerlObj::Perl_my_setenv #undef my_stat @@ -713,6 +739,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 @@ -765,6 +793,8 @@ #define newHVREF CPerlObj::Perl_newHVREF #undef newHV #define newHV CPerlObj::Perl_newHV +#undef newHVhv +#define newHVhv CPerlObj::Perl_newHVhv #undef newIO #define newIO CPerlObj::Perl_newIO #undef newLISTOP @@ -779,8 +809,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 @@ -791,16 +819,24 @@ #define newSVnv CPerlObj::Perl_newSVnv #undef newSVpv #define newSVpv CPerlObj::Perl_newSVpv +#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 newSVpvf -#define newSVpvf CPerlObj::Perl_newSVpvf #undef newUNOP #define newUNOP CPerlObj::Perl_newUNOP #undef newWHILEOP #define newWHILEOP CPerlObj::Perl_newWHILEOP +#undef new_constant +#define new_constant CPerlObj::new_constant +#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 @@ -835,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 @@ -929,6 +967,8 @@ #define push_scope CPerlObj::Perl_push_scope #undef pregcomp #define pregcomp CPerlObj::Perl_pregcomp +#undef qsortsv +#define qsortsv CPerlObj::qsortsv #undef ref #define ref CPerlObj::Perl_ref #undef refkids @@ -997,8 +1037,14 @@ #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 +#define restore_expect CPerlObj::restore_expect +#undef restore_lex_expect +#define restore_lex_expect CPerlObj::restore_lex_expect #undef restore_magic #define restore_magic CPerlObj::restore_magic #undef restore_rsfp @@ -1033,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 @@ -1055,6 +1103,10 @@ #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_hints +#define save_hints CPerlObj::Perl_save_hints #undef save_hptr #define save_hptr CPerlObj::Perl_save_hptr #undef save_I16 @@ -1153,10 +1205,6 @@ #define skipspace CPerlObj::Perl_skipspace #undef sortcv #define sortcv CPerlObj::sortcv -#undef sortcmp -#define sortcmp CPerlObj::sortcmp -#undef sortcmp_locale -#define sortcmp_locale CPerlObj::sortcmp_locale #ifndef PERL_OBJECT #undef stack_base #define stack_base CPerlObj::Perl_stack_base @@ -1199,12 +1247,20 @@ #define sv_bless CPerlObj::Perl_sv_bless #undef sv_catpv #define sv_catpv CPerlObj::Perl_sv_catpv +#undef sv_catpv_mg +#define sv_catpv_mg CPerlObj::Perl_sv_catpv_mg #undef sv_catpvf #define sv_catpvf CPerlObj::Perl_sv_catpvf +#undef sv_catpvf_mg +#define sv_catpvf_mg CPerlObj::Perl_sv_catpvf_mg #undef sv_catpvn #define sv_catpvn CPerlObj::Perl_sv_catpvn +#undef sv_catpvn_mg +#define sv_catpvn_mg CPerlObj::Perl_sv_catpvn_mg #undef sv_catsv #define sv_catsv CPerlObj::Perl_sv_catsv +#undef sv_catsv_mg +#define sv_catsv_mg CPerlObj::Perl_sv_catsv_mg #undef sv_check_thinkfirst #define sv_check_thinkfirst CPerlObj::sv_check_thinkfirst #undef sv_chop @@ -1279,10 +1335,16 @@ #define sv_reset CPerlObj::Perl_sv_reset #undef sv_setiv #define sv_setiv CPerlObj::Perl_sv_setiv +#undef sv_setiv_mg +#define sv_setiv_mg CPerlObj::Perl_sv_setiv_mg #undef sv_setnv #define sv_setnv CPerlObj::Perl_sv_setnv +#undef sv_setnv_mg +#define sv_setnv_mg CPerlObj::Perl_sv_setnv_mg #undef sv_setuv #define sv_setuv CPerlObj::Perl_sv_setuv +#undef sv_setuv_mg +#define sv_setuv_mg CPerlObj::Perl_sv_setuv_mg #undef sv_setref_iv #define sv_setref_iv CPerlObj::Perl_sv_setref_iv #undef sv_setref_nv @@ -1293,14 +1355,24 @@ #define sv_setref_pvn CPerlObj::Perl_sv_setref_pvn #undef sv_setpv #define sv_setpv CPerlObj::Perl_sv_setpv +#undef sv_setpv_mg +#define sv_setpv_mg CPerlObj::Perl_sv_setpv_mg #undef sv_setpvf #define sv_setpvf CPerlObj::Perl_sv_setpvf +#undef sv_setpvf_mg +#define sv_setpvf_mg CPerlObj::Perl_sv_setpvf_mg #undef sv_setpviv #define sv_setpviv CPerlObj::Perl_sv_setpviv +#undef sv_setpviv_mg +#define sv_setpviv_mg CPerlObj::Perl_sv_setpviv_mg #undef sv_setpvn #define sv_setpvn CPerlObj::Perl_sv_setpvn +#undef sv_setpvn_mg +#define sv_setpvn_mg CPerlObj::Perl_sv_setpvn_mg #undef sv_setsv #define sv_setsv CPerlObj::Perl_sv_setsv +#undef sv_setsv_mg +#define sv_setsv_mg CPerlObj::Perl_sv_setsv_mg #undef sv_taint #define sv_taint CPerlObj::Perl_sv_taint #undef sv_tainted @@ -1319,6 +1391,8 @@ #define sv_upgrade CPerlObj::Perl_sv_upgrade #undef sv_usepvn #define sv_usepvn CPerlObj::Perl_sv_usepvn +#undef sv_usepvn_mg +#define sv_usepvn_mg CPerlObj::Perl_sv_usepvn_mg #undef sv_uv #define sv_uv CPerlObj::Perl_sv_uv #undef sv_vcatpvfn @@ -1382,7 +1456,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()