From 2a4d8072390905d051b0d9f7d2098b1c97899cdc Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Thu, 30 Sep 2010 11:19:59 +0100 Subject: Remove empty #if/#endif pairs from embed.h --- embed.h | 52 ---------------------------------------------------- embed.pl | 9 +++++++-- 2 files changed, 7 insertions(+), 54 deletions(-) diff --git a/embed.h b/embed.h index ff7c0704a2..3b17eb44bd 100644 --- a/embed.h +++ b/embed.h @@ -651,18 +651,12 @@ #define warner Perl_warner #endif #define whichsig(a) Perl_whichsig(aTHX_ a) -#if !(defined(EBCDIC)) -#endif #if !(defined(HAS_SIGACTION) && defined(SA_SIGINFO)) #define csighandler Perl_csighandler #endif #if !(defined(NO_MATHOMS)) #define sv_nounlocking(a) Perl_sv_nounlocking(aTHX_ a) #endif -#if !(defined(PERL_GLOBAL_STRUCT_PRIVATE)) -# if defined(PERL_IMPLICIT_CONTEXT) -# endif -#endif #if !(defined(PERL_MAD)) #define newFORM(a,b,c) Perl_newFORM(aTHX_ a,b,c) #define newMYSUB(a,b,c,d,e) Perl_newMYSUB(aTHX_ a,b,c,d,e) @@ -676,17 +670,9 @@ #if !defined(HAS_MEMSET) #define my_memset Perl_my_memset #endif -#if !defined(HAS_SIGNBIT) -#endif -#if !defined(HAS_STRLCAT) -#endif -#if !defined(HAS_STRLCPY) -#endif #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) && defined(F_FREESP) #define my_chsize(a,b) Perl_my_chsize(aTHX_ a,b) #endif -#if !defined(SPRINTF_RETURNS_STRLEN) -#endif #if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY)) #define my_bcopy Perl_my_bcopy #endif @@ -719,19 +705,11 @@ #define my_ntohl(a) Perl_my_ntohl(aTHX_ a) #define my_swap(a) Perl_my_swap(aTHX_ a) #endif -#if defined(NO_MATHOMS) -#endif -#if defined(PERL_DONT_CREATE_GVSV) -#endif #if defined(PERL_GLOBAL_STRUCT) #define GetVars() Perl_GetVars(aTHX) #define free_global_struct(a) Perl_free_global_struct(aTHX_ a) #define init_global_struct() Perl_init_global_struct(aTHX) #endif -#if defined(PERL_GLOBAL_STRUCT_PRIVATE) -# if defined(PERL_IMPLICIT_CONTEXT) -# endif -#endif #if defined(PERL_IMPLICIT_CONTEXT) #define croak_nocontext Perl_croak_nocontext #define deb_nocontext Perl_deb_nocontext @@ -749,10 +727,6 @@ #define warn_nocontext Perl_warn_nocontext #define warner_nocontext Perl_warner_nocontext #endif -#if defined(PERL_IMPLICIT_SYS) -# if defined(USE_ITHREADS) -# endif -#endif #if defined(PERL_MAD) #define newFORM(a,b,c) Perl_newFORM(aTHX_ a,b,c) #define newMYSUB(a,b,c,d,e) Perl_newMYSUB(aTHX_ a,b,c,d,e) @@ -1504,10 +1478,6 @@ #define package(a) Perl_package(aTHX_ a) #define utilize(a,b,c,d,e) Perl_utilize(aTHX_ a,b,c,d,e) # endif -# if !(defined(USE_ITHREADS)) -# if defined(PERL_IN_OP_C) -# endif -# endif # if !defined(HAS_GETENV_LEN) #define getenv_len(a,b) Perl_getenv_len(aTHX_ a,b) # endif @@ -1537,10 +1507,6 @@ #define utf16_textfilter(a,b,c) S_utf16_textfilter(aTHX_ a,b,c) # endif # endif -# if !defined(SETUID_SCRIPTS_ARE_SECURE_NOW) -# if defined(PERL_IN_PERL_C) -# endif -# endif # if !defined(WIN32) #define do_exec3(a,b,c) Perl_do_exec3(aTHX_ a,b,c) # endif @@ -1588,10 +1554,6 @@ #define Slab_to_rw(a) S_Slab_to_rw(aTHX_ a) # endif # endif -# if defined(PL_OP_SLAB_ALLOC) -# endif -# endif -# if defined(PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION) # endif # if defined(PERL_IN_AV_C) #define get_aux_mg(a) S_get_aux_mg(aTHX_ a) @@ -1618,10 +1580,6 @@ #define sequence(a) S_sequence(aTHX_ a) #define sequence_num(a) S_sequence_num(aTHX_ a) #define sequence_tail(a) S_sequence_tail(aTHX_ a) -# if defined(PERL_MAD) -# endif -# endif -# if defined(PERL_IN_DUMP_C) || defined(PERL_IN_HV_C) || defined(PERL_IN_SV_C) # endif # if defined(PERL_IN_GV_C) #define gv_get_super_pkg(a,b) S_gv_get_super_pkg(aTHX_ a,b) @@ -1630,8 +1588,6 @@ #define gv_magicalize_overload(a) S_gv_magicalize_overload(aTHX_ a) #define require_tie_mod(a,b,c,d,e) S_require_tie_mod(aTHX_ a,b,c,d,e) # endif -# if defined(PERL_IN_GV_C) || defined(PERL_IN_SV_C) || defined(PERL_IN_PAD_C) || defined(PERL_IN_OP_C) -# endif # if defined(PERL_IN_HV_C) #define clear_placeholders(a,b) S_clear_placeholders(aTHX_ a,b) #define hfreeentries(a) S_hfreeentries(aTHX_ a) @@ -1647,8 +1603,6 @@ #define share_hek_flags(a,b,c,d) S_share_hek_flags(aTHX_ a,b,c,d) #define unshare_hek_or_pvn(a,b,c,d) S_unshare_hek_or_pvn(aTHX_ a,b,c,d) # endif -# if defined(PERL_IN_HV_C) || defined(PERL_IN_MG_C) || defined(PERL_IN_SV_C) -# endif # if defined(PERL_IN_LOCALE_C) # if defined(USE_LOCALE_NUMERIC) || defined(USE_LOCALE_COLLATE) #define stdize_locale(a) S_stdize_locale(aTHX_ a) @@ -1704,8 +1658,6 @@ #define simplify_sort(a) S_simplify_sort(aTHX_ a) #define too_few_arguments(a,b) S_too_few_arguments(aTHX_ a,b) #define too_many_arguments(a,b) S_too_many_arguments(aTHX_ a,b) -# if defined(USE_ITHREADS) -# endif # endif # if defined(PERL_IN_PAD_C) #define pad_add_name_sv(a,b,c,d) S_pad_add_name_sv(aTHX_ a,b,c,d) @@ -1736,8 +1688,6 @@ #define do_delete_local() S_do_delete_local(aTHX) #define refto(a) S_refto(aTHX_ a) # endif -# if defined(PERL_IN_PP_C) || defined(PERL_IN_PP_HOT_C) -# endif # if defined(PERL_IN_PP_CTL_C) #define check_type_and_open(a) S_check_type_and_open(aTHX_ a) #define destroy_matcher(a) S_destroy_matcher(aTHX_ a) @@ -1796,8 +1746,6 @@ #define doform(a,b,c) S_doform(aTHX_ a,b,c) #define space_join_names_mortal(a) S_space_join_names_mortal(aTHX_ a) # endif -# if defined(PERL_IN_REGCOMP_C) -# endif # if defined(PERL_IN_SCOPE_C) #define save_pushptri32ptr(a,b,c,d) S_save_pushptri32ptr(aTHX_ a,b,c,d) #define save_scalar_at(a,b) S_save_scalar_at(aTHX_ a,b) diff --git a/embed.pl b/embed.pl index 6c4976e630..f5ed05bb96 100755 --- a/embed.pl +++ b/embed.pl @@ -483,12 +483,13 @@ sub embed_h { my ($guard, $funcs) = @_; print $em "$guard\n" if $guard; + my $lines; foreach (@$funcs) { if (@$_ == 1) { my $cond = $_->[0]; # Indent the conditionals if we are wrapped in an #if/#endif pair. $cond =~ s/#(.*)/# $1/ if $guard; - print $em "$cond\n"; + $lines .= "$cond\n"; next; } my $ret = ""; @@ -526,8 +527,12 @@ sub embed_h { $ret .= $alist . ")\n"; } } - print $em $ret if $ret; + $lines .= $ret; } + # Prune empty #if/#endif pairs. + while ($lines =~ s/#\s*if[^\n]+\n#\s*endif\n//) { + } + print $em $lines; print $em "#endif\n" if $guard; } -- cgit v1.2.1