Solaris was happy, but change 28247 removed the wrong dTHX as far as

[perl5.git] / util.h

diff --git a/util.h b/util.h
index d188e34..ff11b78 100644 (file)
--- a/util.h
+++ b/util.h
@@ -1,6 +1,7 @@
 /*    util.h
  *
- *    Copyright (c) 1991-2001, Larry Wall
+ *    Copyright (C) 1991, 1992, 1993, 1999, 2001, 2002,
+ *    by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -15,22 +16,28 @@
                 && (isALNUM((f)[1]) || strchr("$-_]>",(f)[1])))))
 
 #else          /* !VMS */
-#  ifdef WIN32
+#  if defined(WIN32) || defined(__CYGWIN__)
 #    define PERL_FILE_IS_ABSOLUTE(f) \
-       (*(f) == '/'                                                    \
-        || ((f)[0] && (f)[1] == ':')           /* drive name */        \
-        || ((f)[0] == '\\' && (f)[1] == '\\')) /* UNC path */
+       (*(f) == '/' || *(f) == '\\'            /* UNC/rooted path */   \
+        || ((f)[0] && (f)[1] == ':'))          /* drive name */
 #  else                /* !WIN32 */
-#    if defined( DOSISH) || defined(EPOC)
+#  ifdef NETWARE
+#    define PERL_FILE_IS_ABSOLUTE(f) \
+       (((f)[0] && (f)[1] == ':')              /* drive name */        \
+        || ((f)[0] == '\\' && (f)[1] == '\\')  /* UNC path */  \
+        ||     ((f)[3] == ':'))                                /* volume name, currently only sys */
+#  else                /* !NETWARE */
+#    if defined(DOSISH) || defined(EPOC) || defined(__SYMBIAN32__)
 #      define PERL_FILE_IS_ABSOLUTE(f) \
        (*(f) == '/'                                                    \
         || ((f)[0] && (f)[1] == ':'))          /* drive name */
-#    else      /* NEITHER DOSISH NOR EPOCISH */
+#    else      /* NEITHER DOSISH NOR EPOCISH NOR SYMBIANISH */
 #      ifdef MACOS_TRADITIONAL
 #        define PERL_FILE_IS_ABSOLUTE(f)       (strchr(f, ':') && *(f) != ':')
 #      else /* !MACOS_TRADITIONAL */
 #        define PERL_FILE_IS_ABSOLUTE(f)       (*(f) == '/')
 #      endif /* MACOS_TRADITIONAL */
 #    endif     /* DOSISH */
+#   endif      /* NETWARE */
 #  endif       /* WIN32 */
 #endif         /* VMS */