X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fpathname.h;h=1914e9685a17f811305f8a26b3704dcf7e7d3042;hb=fb84631f1ec8e82d252cbad0b5b7f83a98e74ba9;hp=75daa659401d3945a1c31c5b553db313fa09af05;hpb=dc76e6e4a571b134102aa89a6b500478fb49a73a;p=gnulib.git diff --git a/lib/pathname.h b/lib/pathname.h index 75daa6594..1914e9685 100644 --- a/lib/pathname.h +++ b/lib/pathname.h @@ -13,11 +13,16 @@ 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, @@ -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 */