X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/663f364bd429de50c8f5478879b1285d1270c1b3..02b54f9d07226e99a30271314e02617d5629b511:/dosish.h

diff --git a/dosish.h b/dosish.h
index c939127..8a1ce98 100644
--- a/dosish.h
+++ b/dosish.h
@@ -13,60 +13,30 @@
 #define SH_PATH "/bin/sh"
 #endif
 
-#ifdef DJGPP
-#  define BIT_BUCKET "nul"
-#  define OP_BINARY O_BINARY
+#ifdef WIN32
 #  define PERL_SYS_INIT_BODY(c,v)					\
-	 MALLOC_CHECK_TAINT2(*c,*v) Perl_DJGPP_init(c,v); PERLIO_INIT
-#  define init_os_extras Perl_init_os_extras
-#  define HAS_UTIME
-#  define HAS_KILL
-   char *djgpp_pathexp (const char*);
-   void Perl_DJGPP_init (int *argcp,char ***argvp);
-#  if (DJGPP==2 && DJGPP_MINOR < 2)
-#    define NO_LOCALECONV_MON_THOUSANDS_SEP
-#  endif
-#  define PERL_FS_VER_FMT	"%d_%d_%d"
-#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 */
-
-#ifndef PERL_SYS_TERM_BODY
-#  define PERL_SYS_TERM_BODY() HINTS_REFCNT_TERM; OP_REFCNT_TERM; PERLIO_TERM; MALLOC_TERM
+      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
+#  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
-#define dXSUB_SYS
 
-/*
- * 5.003_07 and earlier keyed on #ifdef MSDOS for determining if we were 
- * running on DOS, *and* if we had to cope with 16 bit memory addressing 
- * constraints, *and* we need to have memory allocated as unsigned long.
+/* Generally add things last-in first-terminated.  IO and memory terminations
+ * need to be generally last
  *
- * with the advent of *real* compilers for DOS, they are not locked together.
- * MSDOS means "I am running on MSDOS". HAS_64K_LIMIT means "I have 
- * 16 bit memory addressing constraints".
- *
- * if you need the last, try #DEFINE MEM_SIZE unsigned long.
- */
-#ifdef MSDOS
-#  ifndef DJGPP
-#    define HAS_64K_LIMIT
-#  endif
+ * BEWARE that using PerlIO in these will be using freed memory, so may appear
+ * to work, but must NOT be retained in production code. */
+#ifndef PERL_SYS_TERM_BODY
+#  define PERL_SYS_TERM_BODY()                         \
+    ENV_TERM; USER_PROP_MUTEX_TERM; LOCALE_TERM;       \
+    HINTS_REFCNT_TERM; KEYWORD_PLUGIN_MUTEX_TERM;      \
+    OP_CHECK_MUTEX_TERM; OP_REFCNT_TERM;               \
+    PERLIO_TERM; MALLOC_TERM; 
 #endif
+#define dXSUB_SYS dNOOP
 
 /* USEMYBINMODE
  *	This symbol, if defined, indicates that the program should
@@ -82,19 +52,10 @@
  *	to include <sys/stat.h> and <sys/types.h> to get any typedef'ed
  *	information.
  */
-#if defined(WIN64) || defined(USE_LARGE_FILES)
-# if defined(__BORLANDC__) /* buk */
-#  include <sys\stat.h>
-#  define Stat_t struct stati64
-# else
-#define Stat_t struct _stati64
-# endif
-#else
-#if defined(UNDER_CE)
-#define Stat_t struct xcestat
+#if defined(WIN32)
+#  define Stat_t struct w32_stat
 #else
-#define Stat_t struct stat
-#endif
+#  define Stat_t struct _stati64
 #endif
 
 /* USE_STAT_RDEV:
@@ -133,11 +94,7 @@
 #define fwrite1 fwrite
 
 #define Fstat(fd,bufptr)   fstat((fd),(bufptr))
-#ifdef DJGPP
-#   define Fflush(fp)      djgpp_fflush(fp)
-#else
-#   define Fflush(fp)      fflush(fp)
-#endif
+#define Fflush(fp)      fflush(fp)
 #define Mkdir(path,mode)   mkdir((path),(mode))
 
 #ifndef WIN32
@@ -150,50 +107,13 @@
 #  define HAS_CHOWN
 #endif	/* WIN32 */
 
-/*
- * <rich@phekda.freeserve.co.uk>: The DJGPP port has code that converts
- * the return code of system() into the form that Unixy wait usually
- * returns:
- *
- * - signal number in bits 0-6;
- * - core dump flag in bit 7;
- * - exit code in bits 8-15.
- *
- * Bits 0-7 are always zero for DJGPP, because it uses system().
- * See djgpp.c.
- *
- * POSIX::W* use the W* macros from <sys/wait.h> to decode
- * the return code. Unfortunately the W* macros for DJGPP use
- * a different format than Unixy wait does. So there's a mismatch
- * and, say, WEXITSTATUS($?) will return bogus values.
- *
- * So here we add hack to redefine the W* macros from DJGPP's <sys/wait.h>
- * to work with our return-code conversion.
- */
-
-#ifdef DJGPP
-
-#include <sys/wait.h>
-
-#undef WEXITSTATUS
-#undef WIFEXITED
-#undef WIFSIGNALED
-#undef WIFSTOPPED
-#undef WNOHANG
-#undef WSTOPSIG
-#undef WTERMSIG
-#undef WUNTRACED
-
-#define WEXITSTATUS(stat_val) ((stat_val) >> 8)
-#define WIFEXITED(stat_val)   0
-#define WIFSIGNALED(stat_val) 0
-#define WIFSTOPPED(stat_val)  0
-#define WNOHANG               0
-#define WSTOPSIG(stat_val)    0
-#define WTERMSIG(stat_val)    0
-#define WUNTRACED             0
+/* Don't go reading from /dev/urandom */
+#define PERL_NO_DEV_RANDOM
 
+#ifdef WIN32
+#  define NO_ENVIRON_ARRAY
 #endif
 
-/* Don't go reading from /dev/urandom */
-#define PERL_NO_DEV_RANDOM
+/*
+ * ex: set ts=8 sts=4 sw=4 et:
+ */