[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2007-05-03 12:19:18
Message-ID: 1178194758.087145.5968.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 660684 by lunakl:

KDE_WEAK - for marking symbols as weak, so that e.g. -Bdirect knows
the symbols may be overriden and will not bind directly



 M  +12 -0     kdecore/kdemacros.h.in  
 M  +1 -0      kdecore/kprotocolinfo_kdecore.cpp  
 M  +9 -0      kio/kio/kprotocolinfo.h  


--- branches/KDE/3.5/kdelibs/kdecore/kdemacros.h.in #660683:660684
@@ -205,4 +205,16 @@
     virtual void reservedVirtual10() {} \
     RESERVE_VIRTUAL_9
 
+/**
+ * The KDE_WEAK macro can be used to tell the compiler that
+ * a particular function should be a weak symbol (that e.g. may be overriden
+ * in another library, -Bdirect will not bind this symbol directly)
+ */
+
+#ifdef __GNUC__
+#define KDE_WEAK __attribute__((__weak__))
+#else
+#define KDE_WEAK
+#endif
+
 #endif /* _KDE_MACROS_H_ */
--- branches/KDE/3.5/kdelibs/kdecore/kprotocolinfo_kdecore.cpp #660683:660684
@@ -21,6 +21,7 @@
 #define KIO_EXPORT KDE_EXPORT
 #endif
 
+#define KPROTOCOLINFO_KDECORE
 #include "kprotocolinfo.h"
 #include "kprotocolinfofactory.h"
 
--- branches/KDE/3.5/kdelibs/kio/kio/kprotocolinfo.h #660683:660684
@@ -96,6 +96,9 @@
    * Same as above except you can supply just the protocol instead of
    * the whole URL.
    */
+#ifdef KPROTOCOLINFO_KDECORE
+  KDE_WEAK
+#endif
   static bool isKnownProtocol( const QString& protocol );
 
   /**
@@ -221,6 +224,9 @@
    * Same as above except you can supply just the protocol instead of
    * the whole URL.
    */
+#ifdef KPROTOCOLINFO_KDECORE
+  KDE_WEAK
+#endif
   static bool isHelperProtocol( const QString& protocol );
 
   /**
@@ -245,6 +251,9 @@
    * Same as above except you can supply just the protocol instead of
    * the whole URL.
    */
+#ifdef KPROTOCOLINFO_KDECORE
+  KDE_WEAK
+#endif
   static bool isFilterProtocol( const QString& protocol );
 
   /**
[prev in list] [next in list] [prev in thread] [next in thread]