diff options
Diffstat (limited to 'WebCore/platform/posix/FileSystemPOSIX.cpp')
| -rw-r--r-- | WebCore/platform/posix/FileSystemPOSIX.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/WebCore/platform/posix/FileSystemPOSIX.cpp b/WebCore/platform/posix/FileSystemPOSIX.cpp index db8dff8..ac8c7fa 100644 --- a/WebCore/platform/posix/FileSystemPOSIX.cpp +++ b/WebCore/platform/posix/FileSystemPOSIX.cpp @@ -30,18 +30,14 @@ #include "FileSystem.h" #include "PlatformString.h" -<<<<<<< HEAD - -#include <sys/stat.h> #ifdef ANDROID_PLUGINS -#include <sys/types.h> #include <dirent.h> -#include <fnmatch.h> #endif -======= #include <errno.h> #include <fcntl.h> ->>>>>>> webkit.org at r58033 +#ifdef ANDROID_PLUGINS +#include <fnmatch.h> +#endif #include <libgen.h> #include <sys/stat.h> #include <sys/types.h> |