X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fdos.m4;h=0713cf14e6fe0af53a7ae826b8197c07326b55e4;hb=fc86a0be1b68e4b24d9249d763d33701b3a81623;hp=34cc7390750b03b4289769671a14b2a96c03c426;hpb=23fe10e274cf20fb2cb75ea1da9556a733106657;p=gnulib.git

diff --git a/m4/dos.m4 b/m4/dos.m4
index 34cc73907..0713cf14e 100644
--- a/m4/dos.m4
+++ b/m4/dos.m4
@@ -1,8 +1,13 @@
-#serial 6
+#serial 9
 
 # Define some macros required for proper operation of code in lib/*.c
 # on MSDOS/Windows systems.
 
+# Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 # From Jim Meyering.
 
 AC_DEFUN([gl_AC_DOS],
@@ -10,7 +15,7 @@ AC_DEFUN([gl_AC_DOS],
     AC_CACHE_CHECK([whether system is Windows or MSDOS], [ac_cv_win_or_dos],
       [
         AC_TRY_COMPILE([],
-        [#if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__
+        [#if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__ && !defined __CYGWIN__
 neither MSDOS nor Windows
 #endif],
         [ac_cv_win_or_dos=yes],
@@ -25,28 +30,28 @@ neither MSDOS nor Windows
       ac_fs_backslash_is_file_name_separator=0
     fi
 
-    AH_VERBATIM(FILESYSTEM_PREFIX_LEN,
-    [#if FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
-# define FILESYSTEM_PREFIX_LEN(Filename) \
+    AH_VERBATIM(FILE_SYSTEM_PREFIX_LEN,
+    [#if FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
+# define FILE_SYSTEM_PREFIX_LEN(Filename) \
   ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0)
 #else
-# define FILESYSTEM_PREFIX_LEN(Filename) 0
+# define FILE_SYSTEM_PREFIX_LEN(Filename) 0
 #endif])
 
-    AC_DEFINE_UNQUOTED([FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX],
+    AC_DEFINE_UNQUOTED([FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX],
       $ac_fs_accepts_drive_letter_prefix,
       [Define on systems for which file names may have a so-called
        `drive letter' prefix, define this to compute the length of that
        prefix, including the colon.])
 
     AH_VERBATIM(ISSLASH,
-    [#if FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
+    [#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 #else
 # define ISSLASH(C) ((C) == '/')
 #endif])
 
-    AC_DEFINE_UNQUOTED([FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR],
+    AC_DEFINE_UNQUOTED([FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR],
       $ac_fs_backslash_is_file_name_separator,
       [Define if the backslash character may also serve as a file name
        component separator.])