Integrate mainline

[p5sagit/p5-mst-13.2.git] / ext / File / Glob / Glob.xs

diff --git a/ext/File/Glob/Glob.xs b/ext/File/Glob/Glob.xs
index 037b85c..1bb5fc4 100644 (file)
--- a/ext/File/Glob/Glob.xs
+++ b/ext/File/Glob/Glob.xs
@@ -14,7 +14,7 @@ START_MY_CXT
 
 #define GLOB_ERROR     (MY_CXT.x_GLOB_ERROR)
 
-#include "constants.c"
+#include "const-c.inc"
 
 #ifdef WIN32
 #define errfunc                NULL
@@ -63,10 +63,12 @@ PPCODE:
                                      strlen(pglob.gl_pathv[i])));
            TAINT;
            SvTAINT(tmp);
+           if (pglob.gl_flags & GLOB_UTF8 && !IN_BYTES)
+               SvUTF8_on(tmp);
            PUSHs(tmp);
        }
 
        bsd_globfree(&pglob);
     }
 
-INCLUDE: constants.xs
+INCLUDE: const-xs.inc