diff --git a/ChangeLog b/ChangeLog index 2246644158..409a8832c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,9 @@ 2005-10-07 Matthias Clasen + * gtk/gtkfilechooserdefault.c: Properly fix the unistd.h include + by moving it out of the profiling ifdef. + * gtk/gtkfilechooserdefault.c: Remove a redundant (and unconditional) include of unistd.h (#318211, Kazuki Iwamoto) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2246644158..409a8832c7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -33,6 +33,9 @@ 2005-10-07 Matthias Clasen + * gtk/gtkfilechooserdefault.c: Properly fix the unistd.h include + by moving it out of the profiling ifdef. + * gtk/gtkfilechooserdefault.c: Remove a redundant (and unconditional) include of unistd.h (#318211, Kazuki Iwamoto) diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 08a2e6caeb..8ef9aaf3f6 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -78,10 +78,6 @@ -/* Profiling stuff */ -#undef PROFILE_FILE_CHOOSER -#ifdef PROFILE_FILE_CHOOSER - #ifdef HAVE_UNISTD_H #include #endif @@ -89,6 +85,11 @@ #include #endif +/* Profiling stuff */ +#undef PROFILE_FILE_CHOOSER +#ifdef PROFILE_FILE_CHOOSER + + #ifndef F_OK #define F_OK 0 #endif