Netware specific changes.

96f8db34 · jani@a193-229-222-105.elisa-laajakaista.fi · 4ac4020f · 96f8db34 · 96f8db34
Commit 96f8db34 authored Dec 14, 2005 by jani@a193-229-222-105.elisa-laajakaista.fi
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/ha_archive.cc sql/ha_archive.cc +1 -1

sql/sql_string.h sql/sql_string.h +1 -1

No files found.
--- 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>


--- 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);