2 files changed, 4 insertions, 7 deletions

diff --git a/libopie2/opiecore/ofilenotify.cpp b/libopie2/opiecore/ofilenotify.cpp
index 5e9f97b..bcfb1aa 100644
--- a/libopie2/opiecore/ofilenotify.cpp
+++ b/libopie2/opiecore/ofilenotify.cpp
@@ -27,39 +27,33 @@ _;:,     .>    :=|.         This program is free software; you can
 */
 
 #include "ofilenotify.h"
 using namespace Opie::Core;
 
 /* OPIE */
 
 /* QT */
 #include <qobject.h>
 #include <qsignal.h>
 #include <qintdict.h>
 #include <qdir.h>
 
 /* STD */
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifndef _GNU_SOURCE
-    #define _GNU_SOURCE
-    #include <fcntl.h>
-    #undef _GNU_SOURCE
-#else
-    #include <fcntl.h>
-#endif
+#include <fcntl.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
 
 static QIntDict<OFileNotification> notification_list;
 
 namespace Opie {
 namespace Core {
 
 OFileNotification::OFileNotification( QObject* parent, const char* name )
                   :QObject( parent, name ), _active( false )
 {
     qDebug( "OFileNotification::OFileNotification()" );
 }
 
 
diff --git a/libopie2/opiecore/ofilenotify.h b/libopie2/opiecore/ofilenotify.h
index a14842a..3bc141d 100644
--- a/libopie2/opiecore/ofilenotify.h
+++ b/libopie2/opiecore/ofilenotify.h
@@ -15,32 +15,35 @@ _;:,     .>    :=|.         This program is free software; you can
    : ..    .:,     . . .    without even the implied warranty of
    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;     Library General Public License for more
 ++=   -.     .`     .:      details.
 :     =  ...= . :.=-
 -.   .:....=;==+<;          You should have received a copy of the GNU
  -_. . .   )=.  =           Library General Public License along with
    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 
 #ifndef OFILENOTIFY_H
 #define OFILENOTIFY_H
+#if defined (__GNUC__) && (__GNUC__ < 3)
+#define _GNU_SOURCE
+#endif
 
 /* QT */
 #include <qobject.h>
 #include <qsignal.h>
 #include <qstring.h>
 
 /* STD */
 #include <signal.h>
 #include <fcntl.h>
 
 namespace Opie {
 namespace Core {
 
 enum OFileNotificationType { Single = 0x0000000,
                              Multi  = DN_MULTISHOT,
                              Access = DN_ACCESS,