Upgrade Time::Piece from vesion 1.3202 to 1.3203

[perl5.git] / util.h

diff --git a/util.h b/util.h
index 6b63d90..62cb05b 100644 (file)
--- a/util.h
+++ b/util.h
@@ -19,28 +19,22 @@
             || ((*(f) == '[' || *(f) == '<')                           \
                 && (isWORDCHAR((f)[1]) || strchr("$-_]>",(f)[1])))))
 
-#else          /* !VMS */
-#  if defined(WIN32) || defined(__CYGWIN__)
-#    define PERL_FILE_IS_ABSOLUTE(f) \
+#elif defined(WIN32) || defined(__CYGWIN__)
+#  define PERL_FILE_IS_ABSOLUTE(f) \
        (*(f) == '/' || *(f) == '\\'            /* UNC/rooted path */   \
         || ((f)[0] && (f)[1] == ':'))          /* drive name */
-#  else                /* !WIN32 */
-#  ifdef NETWARE
-#    define PERL_FILE_IS_ABSOLUTE(f) \
+#elif defined(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(__SYMBIAN32__)
-#      define PERL_FILE_IS_ABSOLUTE(f) \
+#elif defined(DOSISH) || defined(__SYMBIAN32__)
+#  define PERL_FILE_IS_ABSOLUTE(f) \
        (*(f) == '/'                                                    \
         || ((f)[0] && (f)[1] == ':'))          /* drive name */
-#    else      /* NEITHER DOSISH NOR SYMBIANISH */
-#      define PERL_FILE_IS_ABSOLUTE(f) (*(f) == '/')
-#    endif     /* DOSISH */
-#   endif      /* NETWARE */
-#  endif       /* WIN32 */
-#endif         /* VMS */
+#else  /* NEITHER DOSISH NOR SYMBIANISH */
+#  define PERL_FILE_IS_ABSOLUTE(f)     (*(f) == '/')
+#endif
 
 /*
 =head1 Miscellaneous Functions
@@ -243,7 +237,8 @@ means arg not present, 1 is empty string/null byte */
 
 #ifdef HAS_MEMMEM
 #   define ninstr(big, bigend, little, lend)                                \
-            ((char *) memmem(big, bigend - big, little, lend - little))
+            ((char *) memmem((big), (bigend) - (big),                       \
+                             (little), (lend) - (little)))
 #endif
 
 #if defined(HAS_MKSTEMP) && defined(PERL_CORE)