kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 00:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Small change to allow building on gcc compilers where the system does not

Browse source 
use glibc (*BSD for example)  __GNUC_PREREQ seems to be a glibc feature,
  and not always available on other systems.

  I've renamed my macro to *hopefully* avoid name clashes.

-#if defined(__GNUC__) && __GNUC_PREREQ(3,0)
+
+#if defined(__GNUC__) && defined(__GNUC_MINOR__)
+#define KDE_GNUC_PREREQ(maj,min) \
+  ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#else
+#define KDE_GNUC_PREREQ(maj,min) 0
+#endif
+
+#if defined(__GNUC__) && KDE_GNUC_PREREQ(3,0)

svn path=/trunk/kdebase/nsplugins/; revision=166365
This commit is contained in:
Andy Fawcett 2002-07-13 05:21:10 +00:00
parent 60026abcc9
commit 282dc5b425
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nsplugins/pluginscan.cpp
View file

@ -56,7 +56,15 @@
#include "sdk/npupp.h"
// provide these symbols when compiling with gcc 3.x
#if defined(__GNUC__) && __GNUC_PREREQ(3,0)
#if defined(__GNUC__) && defined(__GNUC_MINOR__)
#define KDE_GNUC_PREREQ(maj,min) \
((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
#else
#define KDE_GNUC_PREREQ(maj,min) 0
#endif
#if defined(__GNUC__) && KDE_GNUC_PREREQ(3,0)
extern "C" void* __builtin_new(size_t s)
{
return operator new(s);

11
nsplugins/viewer/nsplugin.cpp
View file

@ -55,7 +55,16 @@
#include <Xm/DrawingA.h>
// provide these symbols when compiling with gcc 3.x
#if defined(__GNUC__) && __GNUC_PREREQ(3,0)
#if defined __GNUC__ && defined __GNUC_MINOR__
# define KDE_GNUC_PREREQ(maj, min) \
((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
#else
# define KDE_GNUC_PREREQ(maj, min) 0
#endif
#if defined(__GNUC__) && KDE_GNUC_PREREQ(3,0)
extern "C" void* __builtin_new(size_t s)
{
return operator new(s);