summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config.h.cmake6
-rw-r--r--kjs/global.h.in4
-rw-r--r--tdecore/tdemacros.h.cmake11
-rw-r--r--tdecore/tdemacros.h.in4
-rw-r--r--tdehtml/testtdehtml.cpp4
5 files changed, 13 insertions, 16 deletions
diff --git a/config.h.cmake b/config.h.cmake
index 17a871252..b108f8418 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -186,9 +186,6 @@
/* Defined if you have elficon support. */
#cmakedefine HAVE_ELFICON 1
-/* Defined if you have fvisibility and fvisibility-inlines-hidden support. */
-#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
-
/* Define is posix_fadvise is supported */
#cmakedefine HAVE_FADVISE
@@ -1182,9 +1179,6 @@ int snprintf(char *str, size_t n, char const *fmt, ...);
/* execprefix or NONE if not set, for libloading */
#undef __KDE_EXECPREFIX
-/* define to 1 if -fvisibility is supported */
-#undef __KDE_HAVE_GCC_VISIBILITY
-
/* path to su */
#cmakedefine __PATH_SU "@__PATH_SU@"
diff --git a/kjs/global.h.in b/kjs/global.h.in
index 59655fbf1..a9efbfc8e 100644
--- a/kjs/global.h.in
+++ b/kjs/global.h.in
@@ -33,9 +33,9 @@
#define KJS_PACKED
#endif
-#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+#cmakedefine __TDE_HAVE_GCC_VISIBILITY 1
-#ifdef __KDE_HAVE_GCC_VISIBILITY
+#ifdef __TDE_HAVE_GCC_VISIBILITY
#define KJS_EXPORT __attribute__ ((visibility("default")))
#else
#define KJS_EXPORT
diff --git a/tdecore/tdemacros.h.cmake b/tdecore/tdemacros.h.cmake
index b8d5abd43..543e3f8f0 100644
--- a/tdecore/tdemacros.h.cmake
+++ b/tdecore/tdemacros.h.cmake
@@ -1,5 +1,5 @@
-/* This file is part of the KDE libraries
- Copyright (c) 2002-2003 KDE Team
+/* This file is part of the TDE libraries
+ Copyright (c) 2002-2003 TDE Team
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -22,7 +22,10 @@
/* Set by configure */
#cmakedefine __TDE_HAVE_TDEHWLIB 1
-#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+#cmakedefine __TDE_HAVE_GCC_VISIBILITY 1
+#ifdef __TDE_HAVE_GCC_VISIBILITY
+#define __KDE_HAVE_GCC_VISIBILITY __TDE_HAVE_GCC_VISIBILITY
+#endif
/**
* The TDE_NO_EXPORT macro marks the symbol of the given variable
@@ -38,7 +41,7 @@
* \end
*/
-#ifdef __KDE_HAVE_GCC_VISIBILITY
+#ifdef __TDE_HAVE_GCC_VISIBILITY
#define TDE_NO_EXPORT __attribute__ ((visibility("hidden")))
#define TDE_EXPORT __attribute__ ((visibility("default")))
#elif defined(TQ_WS_WIN)
diff --git a/tdecore/tdemacros.h.in b/tdecore/tdemacros.h.in
index 721b6849b..9df1a77ab 100644
--- a/tdecore/tdemacros.h.in
+++ b/tdecore/tdemacros.h.in
@@ -21,7 +21,7 @@
#define _TDE_MACROS_H_
/* Set by configure */
-#undef __KDE_HAVE_GCC_VISIBILITY
+#undef __TDE_HAVE_GCC_VISIBILITY
/**
* The TDE_NO_EXPORT macro marks the symbol of the given variable
@@ -37,7 +37,7 @@
* \end
*/
-#ifdef __KDE_HAVE_GCC_VISIBILITY
+#ifdef __TDE_HAVE_GCC_VISIBILITY
#define TDE_NO_EXPORT __attribute__ ((visibility("hidden")))
#define TDE_EXPORT __attribute__ ((visibility("default")))
#elif defined(TQ_WS_WIN)
diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp
index 6c3d1506e..272c04fb5 100644
--- a/tdehtml/testtdehtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
::exit( 1 );
}
-#ifndef __KDE_HAVE_GCC_VISIBILITY
+#ifndef __TDE_HAVE_GCC_VISIBILITY
TDEHTMLFactory *fac = new TDEHTMLFactory(true);
#endif
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
int ret = a.exec();
-#ifndef __KDE_HAVE_GCC_VISIBILITY
+#ifndef __TDE_HAVE_GCC_VISIBILITY
fac->deref();
#endif
return ret;