summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-10-27 12:12:28 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-10-31 17:16:12 +0900
commitc028d23584f6eee9a11747864a2fcaec8942834d (patch)
tree8183286cd9d962d052cc9daa50b3cf24ac597160
parent01b4e6da6f81bd341d54a49f609e77ff74fdad16 (diff)
downloadtdebase-c028d23584f6eee9a11747864a2fcaec8942834d.tar.gz
tdebase-c028d23584f6eee9a11747864a2fcaec8942834d.zip
Drop Borland compiler specific code
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 8282b8b90a156e69d3dc80dbaeeb2d8ed00988cd)
-rw-r--r--nsplugins/sdk/jni_md.h14
-rw-r--r--nsplugins/sdk/jri_md.h18
2 files changed, 2 insertions, 30 deletions
diff --git a/nsplugins/sdk/jni_md.h b/nsplugins/sdk/jni_md.h
index 58738bbd0..1fb3685de 100644
--- a/nsplugins/sdk/jni_md.h
+++ b/nsplugins/sdk/jni_md.h
@@ -63,7 +63,7 @@
* WHAT'S UP WITH THIS FILE?
*
* This is where we define the mystical JNI_PUBLIC_API macro that works on all
- * platforms. If you're running with Visual C++, Symantec C, or Borland's
+ * platforms. If you're running with Visual C++ or Symantec C
* development environment on the PC, you're all set. Or if you're on the Mac
* with Metrowerks, Symantec or MPW with SC you're ok too. For UNIX it shouldn't
* matter.
@@ -132,18 +132,6 @@
# define JNICALL __export
# endif /* !WINDLL */
# endif /* !_WIN32 */
-# elif defined(__BORLANDC__)
-# if defined(WIN32) || defined(_WIN32)
-# define JNI_PUBLIC_API(ResultType) __export ResultType
-# define JNI_PUBLIC_VAR(VarType) VarType
-# define JNI_NATIVE_STUB(ResultType) __export ResultType
-# define JNICALL
-# else /* !_WIN32 */
-# define JNI_PUBLIC_API(ResultType) ResultType _cdecl _export _loadds
-# define JNI_PUBLIC_VAR(VarType) VarType
-# define JNI_NATIVE_STUB(ResultType) ResultType _cdecl _loadds
-# define JNICALL _loadds
-# endif
# else
# error Unsupported PC development environment.
# endif
diff --git a/nsplugins/sdk/jri_md.h b/nsplugins/sdk/jri_md.h
index 8234addd4..b05d128a2 100644
--- a/nsplugins/sdk/jri_md.h
+++ b/nsplugins/sdk/jri_md.h
@@ -52,7 +52,7 @@ extern "C" {
* WHAT'S UP WITH THIS FILE?
*
* This is where we define the mystical JRI_PUBLIC_API macro that works on all
- * platforms. If you're running with Visual C++, Symantec C, or Borland's
+ * platforms. If you're running with Visual C++ or Symantec C
* development environment on the PC, you're all set. Or if you're on the Mac
* with Metrowerks, Symantec or MPW with SC you're ok too. For UNIX it shouldn't
* matter.
@@ -105,22 +105,6 @@ extern "C" {
# define JRI_CALLBACK __export
# endif /* !WINDLL */
# endif /* !_WIN32 */
-# elif defined(__BORLANDC__)
-# if defined(WIN32) || defined(_WIN32)
-# define JRI_PUBLIC_API(ResultType) __export ResultType
-# define JRI_PUBLIC_VAR(VarType) VarType
-# define JRI_PUBLIC_VAR_EXP(VarType) __export VarType
-# define JRI_PUBLIC_VAR_IMP(VarType) __import VarType
-# define JRI_NATIVE_STUB(ResultType) __export ResultType
-# define JRI_CALLBACK
-# else /* !_WIN32 */
-# define JRI_PUBLIC_API(ResultType) ResultType _cdecl _export _loadds
-# define JRI_PUBLIC_VAR(VarType) VarType
-# define JRI_PUBLIC_VAR_EXP(VarType) __cdecl __export VarType
-# define JRI_PUBLIC_VAR_IMP(VarType) __cdecl __import VarType
-# define JRI_NATIVE_STUB(ResultType) ResultType _cdecl _loadds
-# define JRI_CALLBACK _loadds
-# endif
# else
# error Unsupported PC development environment.
# endif