diff options
| -rw-r--r-- | doop.c | 5 | ||||
| -rw-r--r-- | perl.h | 5 | ||||
| -rw-r--r-- | pp.c | 3 | ||||
| -rw-r--r-- | win32/GNUmakefile | 4 | ||||
| -rw-r--r-- | win32/Makefile | 2 | ||||
| -rw-r--r-- | win32/makefile.mk | 4 |
6 files changed, 7 insertions, 16 deletions
@@ -1005,11 +1005,9 @@ Perl_do_vecset(pTHX_ SV *sv) void Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) { -#ifdef LIBERAL long *dl; long *ll; long *rl; -#endif char *dc; STRLEN leftlen; STRLEN rightlen; @@ -1115,7 +1113,6 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) dc = SvPVX(sv); /* sv_usepvn() calls Renew() */ } -#ifdef LIBERAL if (len >= sizeof(long)*4 && !(PTR2nat(dc) % sizeof(long)) && !(PTR2nat(lc) % sizeof(long)) && @@ -1160,7 +1157,7 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) len = remainder; } -#endif + switch (optype) { case OP_BIT_AND: while (len--) @@ -561,11 +561,6 @@ out of them. # define BYTEORDER 0x1234 #endif -/* Overall memory policy? */ -#ifndef CONSERVATIVE -# define LIBERAL 1 -#endif - #if 'A' == 65 && 'I' == 73 && 'J' == 74 && 'Z' == 90 #define ASCIIish #else @@ -2549,7 +2549,6 @@ S_scomplement(pTHX_ SV *targ, SV *sv) anum = len; -#ifdef LIBERAL { long *tmpl; for ( ; anum && PTR2nat(tmps) % sizeof(long); anum--, tmps++) @@ -2559,7 +2558,7 @@ S_scomplement(pTHX_ SV *targ, SV *sv) *tmpl = ~*tmpl; tmps = (U8*)tmpl; } -#endif + for ( ; anum > 0; anum--, tmps++) *tmps = ~*tmps; } diff --git a/win32/GNUmakefile b/win32/GNUmakefile index 0163ef67b1..2d67f35bd3 100644 --- a/win32/GNUmakefile +++ b/win32/GNUmakefile @@ -590,7 +590,7 @@ a = .a INCLUDES = -I.\include -I. -I.. DEFINES = -DWIN32 ifeq ($(WIN64),define) -DEFINES += -DWIN64 -DCONSERVATIVE +DEFINES += -DWIN64 endif LOCDEFS = -DPERLDLL -DPERL_CORE CXX_FLAG = -xc++ @@ -735,7 +735,7 @@ EXTRACFLAGS += -MD endif ifeq ($(WIN64),define) -DEFINES += -DWIN64 -DCONSERVATIVE +DEFINES += -DWIN64 OPTIMIZE += -fp:precise endif diff --git a/win32/Makefile b/win32/Makefile index 84b3a993de..219ebc4a26 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -519,7 +519,7 @@ EXTRACFLAGS = $(EXTRACFLAGS) -MD !ENDIF !IF "$(WIN64)" == "define" -DEFINES = $(DEFINES) -DWIN64 -DCONSERVATIVE +DEFINES = $(DEFINES) -DWIN64 OPTIMIZE = $(OPTIMIZE) -fp:precise !ENDIF diff --git a/win32/makefile.mk b/win32/makefile.mk index 73a3a39262..003b524dd3 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -560,7 +560,7 @@ a = .a INCLUDES = -I.\include -I. -I.. DEFINES = -DWIN32 .IF "$(WIN64)" == "define" -DEFINES += -DWIN64 -DCONSERVATIVE +DEFINES += -DWIN64 .ENDIF LOCDEFS = -DPERLDLL -DPERL_CORE CXX_FLAG = -xc++ @@ -701,7 +701,7 @@ EXTRACFLAGS += -MD .ENDIF .IF "$(WIN64)" == "define" -DEFINES += -DWIN64 -DCONSERVATIVE +DEFINES += -DWIN64 OPTIMIZE += -fp:precise .ENDIF |