X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fpathname.h;h=1914e9685a17f811305f8a26b3704dcf7e7d3042;hb=5912e24cb503d5238ab9180b98f0215e871a6abc;hp=7b817a4f724251fa54596ff7102d63cb89626a76;hpb=ac52880a4604e1b2cd72ae710870e3d463a12d84;p=gnulib.git

diff --git a/lib/pathname.h b/lib/pathname.h
index 7b817a4f7..1914e9685 100644
--- a/lib/pathname.h
+++ b/lib/pathname.h
@@ -1,5 +1,5 @@
 /* Pathname support.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,19 +13,24 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _PATHNAME_H
 #define _PATHNAME_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /* Pathname support.
    ISSLASH(C)           tests whether C is a directory separator character.
    IS_ABSOLUTE_PATH(P)  tests whether P is an absolute path.  If it is not,
                         it may be concatenated to a directory pathname.
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
@@ -33,13 +38,13 @@
 # define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
 # define IS_PATH_WITH_DIR(P) \
     (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
-# define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
+# define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
 #else
   /* Unix */
 # define ISSLASH(C) ((C) == '/')
 # define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
 # define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
-# define FILESYSTEM_PREFIX_LEN(P) 0
+# define FILE_SYSTEM_PREFIX_LEN(P) 0
 #endif
 
 /* Concatenate a directory pathname, a relative pathname and an optional
@@ -47,4 +52,8 @@
 extern char *concatenated_pathname (const char *directory,
 				    const char *filename, const char *suffix);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _PATHNAME_H */