From 4e1d88af8fe7ec0eac3902bb72a067e8d191bf3a Mon Sep 17 00:00:00 2001
From: unknown <jani@a193-229-222-105.elisa-laajakaista.fi>
Date: Wed, 14 Dec 2005 01:21:56 +0200
Subject: [PATCH] Netware specific changes.

sql/ha_archive.cc:
  Disabled archive db for Netware until
  zlibCompileFlags() is available for this platform.
sql/sql_string.h:
  Added casts. Won't work with Metrowerks compiler without.
---
 sql/ha_archive.cc | 2 +-
 sql/sql_string.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/ha_archive.cc b/sql/ha_archive.cc
index 1e8fc582eb8..2747f678cc3 100644
--- a/sql/ha_archive.cc
+++ b/sql/ha_archive.cc
@@ -20,7 +20,7 @@
 
 #include "mysql_priv.h"
 
-#ifdef HAVE_ARCHIVE_DB
+#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)
 #include "ha_archive.h"
 #include <my_dir.h>
 
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 67c3e0c62f2..0659f684afe 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -24,7 +24,7 @@
 #define NOT_FIXED_DEC			31
 #endif
 
-#define STRING_WITH_LEN(X)  ((char*) X), (sizeof(X)-1)
+#define STRING_WITH_LEN(X)  ((const char*) X), ((uint) (sizeof(X) - 1))
 
 class String;
 int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);