Module: wine Branch: master Commit: 215738a1404570406f51fd5938f1f4c5a120653a URL: http://source.winehq.org/git/wine.git/?a=commit;h=215738a1404570406f51fd5938...
Author: Francois Gouget fgouget@free.fr Date: Sun Oct 19 18:55:13 2008 +0200
dirent.h is a conditional include now.
---
dlls/gdi32/freetype.c | 4 +++- dlls/kernel32/oldconfig.c | 4 +++- dlls/ntdll/directory.c | 4 +++- dlls/ntdll/server.c | 4 +++- dlls/shell32/shfldr_unixfs.c | 4 +++- dlls/shell32/trash.c | 4 +++- dlls/wineps.drv/mkagl.c | 6 +++++- dlls/wineps.drv/truetype.c | 4 +++- dlls/wineps.drv/type1afm.c | 4 +++- 9 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8b0d672..9692450 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -33,7 +33,9 @@ # include <sys/mman.h> #endif #include <string.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include <stdio.h> #include <assert.h>
diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 09e407b..ee41d81 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -32,7 +32,9 @@ # include <sys/stat.h> #endif #include <fcntl.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 0e99c4f..dee0ce6 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -24,7 +24,9 @@ #include "wine/port.h"
#include <sys/types.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include <errno.h> #include <fcntl.h> #include <stdarg.h> diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 6e41eb5..62ccc2c 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -23,7 +23,9 @@
#include <assert.h> #include <ctype.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include <errno.h> #include <fcntl.h> #include <signal.h> diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 332dd45..b612ef7 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -128,7 +128,9 @@ #include <stdio.h> #include <stdarg.h> #include <limits.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include <stdlib.h> #ifdef HAVE_UNISTD_H # include <unistd.h> diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 2762f04..a366f62 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -30,7 +30,9 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif
#include "windef.h" #include "winbase.h" diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index 3606fe6..db789f1 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -16,8 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "config.h" + #include <sys/types.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include <string.h> #include <stdlib.h> #include <stdio.h> diff --git a/dlls/wineps.drv/truetype.c b/dlls/wineps.drv/truetype.c index 0254a75..b526959 100644 --- a/dlls/wineps.drv/truetype.c +++ b/dlls/wineps.drv/truetype.c @@ -59,7 +59,9 @@ #endif
#include <sys/types.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include <string.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index dd7e0ce..85aca42 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -32,7 +32,9 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #include <errno.h> #include <ctype.h> #include <limits.h> /* INT_MIN */
-
Alexandre Julliard