FcStrPathPlus: new helper function

[fontconfig.git] / src / fcint.h

diff --git a/src/fcint.h b/src/fcint.h
index e662c37e22905efc8ba8be81a5c8bfaf45aa2cdb..0a1a90e264dd9ddfae4872bd45d0d644a1fd2849 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -56,8 +56,10 @@
 
 #ifdef _WIN32
 #define FC_SEARCH_PATH_SEPARATOR ';'
+#define FC_DIR_SEPARATOR '\\'
 #else
 #define FC_SEARCH_PATH_SEPARATOR ':'
+#define FC_DIR_SEPARATOR '/'
 #endif
 
 #define FC_DBG_MATCH   1
@@ -239,13 +241,13 @@ typedef struct _FcExpr {
     union {
        int         ival;
        double      dval;
-       FcChar8     *sval;
+       const FcChar8       *sval;
        FcMatrix    *mval;
        FcBool      bval;
        FcCharSet   *cval;
        FcLangSet   *lval;
        FcObject    object;
-       FcChar8     *constant;
+       const FcChar8       *constant;
        struct {
            struct _FcExpr *left, *right;
        } tree;
@@ -544,12 +546,8 @@ FcCacheFini (void);
 FcPrivate void
 FcDirCacheReference (FcCache *cache, int nref);
 
-#ifdef _WIN32
 FcPrivate int
-FcStat (const char *file, struct stat *statb);
-#else
-#define FcStat stat
-#endif
+FcStat (const FcChar8 *file, struct stat *statb);
 
 /* fccfg.c */