summaryrefslogtreecommitdiff
path: root/storage/connect/reldef.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'storage/connect/reldef.cpp')
-rw-r--r--storage/connect/reldef.cpp29
1 files changed, 17 insertions, 12 deletions
diff --git a/storage/connect/reldef.cpp b/storage/connect/reldef.cpp
index 56a7ea8c512..ef91414a9ab 100644
--- a/storage/connect/reldef.cpp
+++ b/storage/connect/reldef.cpp
@@ -1,7 +1,7 @@
/************* RelDef CPP Program Source Code File (.CPP) **************/
/* PROGRAM NAME: RELDEF */
/* ------------- */
-/* Version 1.5 */
+/* Version 1.6 */
/* */
/* COPYRIGHT: */
/* ---------- */
@@ -40,10 +40,12 @@
#include "tabcol.h"
#include "filamap.h"
#include "filamfix.h"
+#if defined(VCT_SUPPORT)
#include "filamvct.h"
-#if defined(ZIP_SUPPORT)
-#include "filamzip.h"
-#endif // ZIP_SUPPORT
+#endif // VCT_SUPPORT
+#if defined(GZ_SUPPORT)
+#include "filamgz.h"
+#endif // GZ_SUPPORT
#include "tabdos.h"
#include "valblk.h"
#include "tabmul.h"
@@ -663,15 +665,15 @@ PTDB OEMDEF::GetTable(PGLOBAL g, MODE mode)
/*********************************************************************/
if (!((PTDBDOS)tdbp)->GetTxfp()) {
if (cmpr) {
-#if defined(ZIP_SUPPORT)
+#if defined(GZ_SUPPORT)
if (cmpr == 1)
- txfp = new(g) ZIPFAM(defp);
+ txfp = new(g) GZFAM(defp);
else
txfp = new(g) ZLBFAM(defp);
-#else // !ZIP_SUPPORT
+#else // !GZ_SUPPORT
strcpy(g->Message, "Compress not supported");
return NULL;
-#endif // !ZIP_SUPPORT
+#endif // !GZ_SUPPORT
} else if (rfm == RECFM_VAR) {
if (map)
txfp = new(g) MAPFAM(defp);
@@ -683,16 +685,19 @@ PTDB OEMDEF::GetTable(PGLOBAL g, MODE mode)
txfp = new(g) MPXFAM(defp);
else
txfp = new(g) FIXFAM(defp);
-
} else if (rfm == RECFM_VCT) {
- assert (Pxdef->GetDefType() == TYPE_AM_VCT);
+#if defined(VCT_SUPPORT)
+ assert(Pxdef->GetDefType() == TYPE_AM_VCT);
if (map)
txfp = new(g) VCMFAM((PVCTDEF)defp);
else
txfp = new(g) VCTFAM((PVCTDEF)defp);
-
- } // endif's
+#else // !VCT_SUPPORT
+ strcpy(g->Message, "VCT no more supported");
+ return NULL;
+#endif // !VCT_SUPPORT
+ } // endif's
((PTDBDOS)tdbp)->SetTxfp(txfp);
} // endif Txfp