9 files changed, 9 insertions, 99 deletions
diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README
index 21edd0fc2..9441806f7 100644
--- a/akregator/src/mk4storage/metakit/README
+++ b/akregator/src/mk4storage/metakit/README
@@ -86,7 +86,7 @@ WINDOWS
 
     There is a "win/" directory which contains subdirectories for a number of
     compiler systems.  Metakit has been built with many different compilers
-    in the past (Microsoft, Borland, Watcom, Symantec, Metrowerks, Optima),
+    in the past (Microsoft, Watcom, Symantec, Metrowerks, Optima),
     only a few are maintained (there are 12 configurations for MSVC6 alone!).
 
     The MS Visual C++ 6.0 project is "win/msvc60/mksrc.dsw", with subprojects
@@ -103,9 +103,6 @@ WINDOWS
     The core libraries are built with "mac/cw5.mcp", demos / tests are built
     with "cw5apps.mcp", Tcl is "cw5tcl.mcp", and Python is "cw5python.mcp".
 
-    The Borland C++ Builder projects have not yet been incorporated in this
-    release, but the "KitViewer" application is an example of how to use BCB.
-
     The Cygwin build (B20.1 / gcc 2.95.2) is different, because it uses the
     unix autoconf system, and must be launched as described above for UNIX.
     I have upgraded to the latest development of libtool to be able to build
diff --git a/akregator/src/mk4storage/metakit/include/mk4.h b/akregator/src/mk4storage/metakit/include/mk4.h
index 33016dba0..b6aef603c 100644
--- a/akregator/src/mk4storage/metakit/include/mk4.h
+++ b/akregator/src/mk4storage/metakit/include/mk4.h
@@ -114,19 +114,6 @@
 
 //---------------------------------------------------------------------------
 
-    // Borland C++ and C++ Builder
-#if defined (__BORLANDC__)
-    // by default, if runtime is linked as a DLL, then so is Metakit
-#if defined (_RTLDLL) && !defined (q4_KITDLL)
-#define q4_KITDLL 1
-#endif
-
-    // Borland 5.0 supports the bool datatype
-#if __BORLANDC__ >= 0x500
-#define q4_BOOL 1
-#endif
-#endif // __BORLANDC__
-
     // IRIX supports the bool datatype
     // define before gcc to cover both the gcc and MipsPRO compiler
 #if defined (sgi)
diff --git a/akregator/src/mk4storage/metakit/src/Makefile.am b/akregator/src/mk4storage/metakit/src/Makefile.am
index e428fe930..8e6e94db6 100644
--- a/akregator/src/mk4storage/metakit/src/Makefile.am
+++ b/akregator/src/mk4storage/metakit/src/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/../include
 
 noinst_LTLIBRARIES = libmetakitlocal.la
 
-noinst_HEADERS = borc.h column.h column.inl custom.h derived.h field.h field.inl format.h gnuc.h handler.h handler.inl header.h mfc.h \
+noinst_HEADERS = column.h column.inl custom.h derived.h field.h field.inl format.h gnuc.h handler.h handler.inl header.h mfc.h \
 		msvc.h mwcw.h persist.h remap.h std.h store.h store.inl univ.h univ.inl win.h
 
 libmetakitlocal_la_SOURCES = column.cpp custom.cpp derived.cpp field.cpp fileio.cpp format.cpp handler.cpp persist.cpp remap.cpp std.cpp store.cpp \
diff --git a/akregator/src/mk4storage/metakit/src/borc.h b/akregator/src/mk4storage/metakit/src/borc.h
deleted file mode 100644
index 2b881fc90..000000000
--- a/akregator/src/mk4storage/metakit/src/borc.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// borc.h --
-// $Id$
-// This is part of Metakit, see http://www.equi4.com/metakit/
-
-/** @file
- * Configuration header for Borland C++
- */
-
-#define q4_BORC 1
-
-  // get rid of several common warning messages
-#if !q4_STRICT
-#pragma warn -aus // 'identifier' is assigned a value that is never used
-#pragma warn -par // Parameter 'parameter' is never used.
-#pragma warn -sig // Conversion may lose significant digits
-#pragma warn -use // 'identifier' declared but never used
-#endif
-
-#if __BORLANDC__ >= 0x500
-#define q4_BOOL 1     // supports the bool datatype
-  // undo previous defaults, because q4_BOOL is not set early enough
-#undef false
-#undef true
-#undef bool
-#endif
-
-#if !defined (q4_EXPORT)
-#define q4_EXPORT 1     // requires export/import specifiers
-#endif
-
-#if defined (__MT__)
-#define q4_MULTI 1      // uses multi-threading
-#endif
diff --git a/akregator/src/mk4storage/metakit/src/fileio.cpp b/akregator/src/mk4storage/metakit/src/fileio.cpp
index 28ff7dca0..3e749af80 100644
--- a/akregator/src/mk4storage/metakit/src/fileio.cpp
+++ b/akregator/src/mk4storage/metakit/src/fileio.cpp
@@ -319,7 +319,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_)
 {
   d4_assert(!_file);
 
-#if q4_WIN32 && !q4_BORC && !q4_WINCE
+#if q4_WIN32 && !q4_WINCE
   int flags = _O_BINARY | _O_NOINHERIT | (mode_ > 0 ? _O_RDWR : _O_RDONLY);
   int fd = _open(fname_, flags);
   if (fd != -1)
@@ -330,7 +330,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_)
   if (_file != 0)
     fcntl(fileno(_file), F_SETFD, FD_CLOEXEC);
 #endif //q4_UNIX
-#endif //q4_WIN32 && !q4_BORC && !q4_WINCE
+#endif //q4_WIN32 && !q4_WINCE
 
   if (_file != 0) {
     ResetFileMapping();
@@ -338,7 +338,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_)
   }
 
   if (mode_ > 0) {
-#if q4_WIN32 && !q4_BORC && !q4_WINCE
+#if q4_WIN32 && !q4_WINCE
     fd = _open(fname_, flags | _O_CREAT, _S_IREAD | _S_IWRITE);
     if (fd != -1)
       _cleanup = _file = _fdopen(fd, "w+b");
@@ -348,7 +348,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_)
     if (_file != 0)
       fcntl(fileno(_file), F_SETFD, FD_CLOEXEC);
 #endif //q4_UNIX
-#endif //q4_WIN32 && !q4_BORC && !q4_WINCE
+#endif //q4_WIN32 && !q4_WINCE
   }
 
   //d4_assert(_file != 0);
diff --git a/akregator/src/mk4storage/metakit/src/header.h b/akregator/src/mk4storage/metakit/src/header.h
index 2f8648b8f..769e34fe3 100644
--- a/akregator/src/mk4storage/metakit/src/header.h
+++ b/akregator/src/mk4storage/metakit/src/header.h
@@ -91,9 +91,7 @@
 // Use '#define q4_xxx 1' to flag the choice of an IDE, and optionally also
 // add '#include "file.h"' to force inclusion of a header file right here.
 
-#if defined (__BORLANDC__)                  // Borland C++
-#include "borc.h"
-#elif defined (__DECCXX)                    // DEC C++
+#if defined (__DECCXX)                      // DEC C++
 #define q4_DECC 1
 #elif defined (__GNUC__)                    // GNU C++
 #include "gnuc.h"
diff --git a/akregator/src/mk4storage/metakit/src/string.cpp b/akregator/src/mk4storage/metakit/src/string.cpp
index 33c8836c8..9df22c5fb 100644
--- a/akregator/src/mk4storage/metakit/src/string.cpp
+++ b/akregator/src/mk4storage/metakit/src/string.cpp
@@ -34,7 +34,7 @@
   
 /////////////////////////////////////////////////////////////////////////////
 
-#if q4_MSVC || q4_WATC || q4_BORC || (q4_MWCW && __MWERKS__ < 0x3000)
+#if q4_MSVC || q4_WATC || (q4_MWCW && __MWERKS__ < 0x3000)
 #define strcasecmp stricmp
 #elif q4_WINCE
 
diff --git a/akregator/src/mk4storage/metakit/src/univ.cpp b/akregator/src/mk4storage/metakit/src/univ.cpp
index 81a73015a..446d369d7 100644
--- a/akregator/src/mk4storage/metakit/src/univ.cpp
+++ b/akregator/src/mk4storage/metakit/src/univ.cpp
@@ -21,7 +21,7 @@
 
 #if q4_UNIX || __MINGW32__
 #define _strdup strdup
-#elif !q4_BORC && !q4_MSVC && !q4_WATC && !(q4_MWCW && defined(_WIN32)) && \
+#elif !q4_MSVC && !q4_WATC && !(q4_MWCW && defined(_WIN32)) && \
 		!(q4_MWCW && __MWERKS__ >= 0x3000)
 
   static char* _strdup(const char* p)
@@ -35,34 +35,6 @@
 
 #endif
 
-  //  The Borland C++ RTL does not want file handle objects to cross
-  //  DLL boundaries, so we add special fopen/fclose hooks to this DLL.
-
-#if q4_BORC
-  #include <stdio.h>
-
-#if q4_WIN32
-  __declspec(dllexport) FILE*
-#else
-  FILE* __export
-#endif
-  f4_FileOpenInDLL(const char* name_, const char* mode_)
-  {
-    return fopen(name_, mode_);
-  }
-
-#if q4_WIN32
-  __declspec(dllexport)
-#else
-  int __export
-#endif
-  f4_FileCloseInDLL(FILE* file_)
-  {
-    return fclose(file_);
-  }
-
-#endif
-
 /////////////////////////////////////////////////////////////////////////////
 // c4_BaseArray
 
diff --git a/akregator/src/mk4storage/metakit/tests/regress.h b/akregator/src/mk4storage/metakit/tests/regress.h
index b5611e574..1574bc0d4 100644
--- a/akregator/src/mk4storage/metakit/tests/regress.h
+++ b/akregator/src/mk4storage/metakit/tests/regress.h
@@ -132,14 +132,3 @@ extern void TestStores2();
 extern void TestStores3();
 extern void TestStores4();
 extern void TestStores5();
-
-  //  The Borland C++ RTL does not want file handle objects to cross
-  //  DLL boundaries, so we use special fopen/fclose hooks in the DLL.
-
-#if defined (__BORLANDC__) // this assumes Metakit is in a DLL!
-extern FILE* f4_FileOpenInDLL(const char*, const char*);
-extern int f4_FileCloseInDLL(FILE*);
-
-#define fopen f4_FileOpenInDLL
-#define fclose f4_FileCloseInDLL
-#endif