pp.c, pp_sys.c: Use DO_UTF8 instead of its expansion

[perl5.git] / dosish.h

diff --git a/dosish.h b/dosish.h
index 1dc9322..dff759b 100644 (file)
--- a/dosish.h
+++ b/dosish.h
@@ -32,29 +32,26 @@
 #  define PERL_FS_VERSION      STRINGIFY(PERL_REVISION) "_" \
                                STRINGIFY(PERL_VERSION) "_" \
                                STRINGIFY(PERL_SUBVERSION)
-#else  /* DJGPP */
-#  ifdef WIN32
-#    define PERL_SYS_INIT_BODY(c,v)                                    \
-       MALLOC_CHECK_TAINT2(*c,*v) Perl_win32_init(c,v); PERLIO_INIT
-#    define PERL_SYS_TERM_BODY()   Perl_win32_term()
-#    define BIT_BUCKET "nul"
-#  else
-#       ifdef NETWARE
-#      define PERL_SYS_INIT_BODY(c,v)                                  \
-       MALLOC_CHECK_TAINT2(*c,*v) Perl_nw5_init(c,v); PERLIO_INIT
-#      define BIT_BUCKET "nwnul"
-#    else
-#      define PERL_SYS_INIT_BODY(c,v)          \
-       MALLOC_CHECK_TAINT2(*c,*v); PERLIO_INIT
-#      define BIT_BUCKET "\\dev\\nul" /* "wanna be like, umm, Newlined, or somethin?" */
-#    endif /* NETWARE */
-#  endif
-#endif /* DJGPP */
+#elif defined(WIN32)
+#  define PERL_SYS_INIT_BODY(c,v)                                      \
+      MALLOC_CHECK_TAINT2(*c,*v) Perl_win32_init(c,v); PERLIO_INIT
+#  define PERL_SYS_TERM_BODY()   Perl_win32_term()
+#  define BIT_BUCKET "nul"
+#elif defined(NETWARE)
+#  define PERL_SYS_INIT_BODY(c,v)                                      \
+    MALLOC_CHECK_TAINT2(*c,*v) Perl_nw5_init(c,v); PERLIO_INIT
+#  define BIT_BUCKET "nwnul"
+#else
+#  define PERL_SYS_INIT_BODY(c,v)              \
+    MALLOC_CHECK_TAINT2(*c,*v); PERLIO_INIT
+#  define BIT_BUCKET "\\dev\\nul" /* "wanna be like, umm, Newlined, or somethin?" */
+#endif
 
 #ifndef PERL_SYS_TERM_BODY
-#  define PERL_SYS_TERM_BODY()                              \
-    HINTS_REFCNT_TERM; OP_CHECK_MUTEX_TERM;                 \
-    OP_REFCNT_TERM; PERLIO_TERM; MALLOC_TERM; LOCALE_TERM;
+#  define PERL_SYS_TERM_BODY()                         \
+    HINTS_REFCNT_TERM; KEYWORD_PLUGIN_MUTEX_TERM;      \
+    OP_CHECK_MUTEX_TERM; OP_REFCNT_TERM; PERLIO_TERM;  \
+    MALLOC_TERM; LOCALE_TERM; USER_PROP_MUTEX_TERM;
 #endif
 #define dXSUB_SYS dNOOP
 
@@ -73,13 +70,11 @@
  *     information.
  */
 #if defined(WIN64) || defined(USE_LARGE_FILES)
-#define Stat_t struct _stati64
+#  define Stat_t struct _stati64
+#elif defined(UNDER_CE)
+#  define Stat_t struct xcestat
 #else
-#if defined(UNDER_CE)
-#define Stat_t struct xcestat
-#else
-#define Stat_t struct stat
-#endif
+#  define Stat_t struct stat
 #endif
 
 /* USE_STAT_RDEV: