Index: trunk/ext/build/apr.build
===================================================================
--- trunk/ext/build/apr.build	(revision 20671)
+++ trunk/ext/build/apr.build	(working copy)
@@ -82,6 +82,7 @@
         <include name="mmap\unix\common.c" />
         <include name="passwd\*.c" />
         <include name="poll\unix\select.c" />
+        <include name="poll\unix\pollset.c" />
         <include name="shmem\win32\*.c" />
         <include name="strings\*.c" />
         <include name="tables\*.c" />
@@ -100,6 +101,7 @@
         <define name="WIN32" />
         <define name="_WINDOWS" />
         <define name="_WIN32" />
+        <define name="APR_HAS_UNICODE_FS" value="1"/>
         <define name="_WIN32_WINNT" value="0x0501"/>
         <define name="WIN64" if="${platform == 'x64'}" />
         <define name="_WINDLL" if="${static != 'static'}" />