summaryrefslogtreecommitdiff
path: root/mit-pthreads
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2001-01-27 01:20:56 +0200
committerunknown <monty@donna.mysql.com>2001-01-27 01:20:56 +0200
commit52a4c5a10063f2e7b06a32add3b87ba0b0ae2b45 (patch)
treebf79d814679a767435990f41e226728ee5927766 /mit-pthreads
parent002b51000fcec9ff8c45afe12ddd3728f6035ff0 (diff)
downloadmariadb-git-52a4c5a10063f2e7b06a32add3b87ba0b0ae2b45.tar.gz
Portability fixes for OPENBSD, OS2 and Windows
Docs/manual.texi: Changed TCX -> MySQL AB configure.in: New version include/my_sys.h: Fixes for OS2 ltconfig: Fixes for OS2 ltmain.sh: Fixes for OS2 mit-pthreads/net/net_internal.h: Fixes for OPENBSD mit-pthreads/net/proto_internal.h: Fixes for OPENBSD mit-pthreads/net/res_internal.h: Fixes for OPENBSD mit-pthreads/net/serv_internal.h: Fixes for OPENBSD myisammrg/myrg_open.c: MERGE didn't work on Windows mysys/my_getwd.c: Fixes for OS2 sql/field.cc: cleanup sql/field.h: Fix for new SCO compiler sql/ha_berkeley.cc: Cleanup sql/ha_berkeley.h: Portability fix sql/item_sum.h: Fix for new SCO compiler sql/log.cc: Fixes for OS2 sql/log_event.h: Fixes for OS2 sql/mysqld.cc: Fixes for OS2 sql/net_serv.cc: Fixes for OS2 sql/sql_analyse.h: Fix for new SCO compiler sql/sql_class.h: Fix for new SCO compiler sql/sql_map.h: Fix for new SCO compiler sql/sql_repl.cc: cleanup sql/sql_string.h: Fix for new SCO compiler sql/sql_table.cc: cleanup strings/longlong2str-x86.s: Fixes for openbsd
Diffstat (limited to 'mit-pthreads')
-rw-r--r--mit-pthreads/net/net_internal.h1
-rw-r--r--mit-pthreads/net/proto_internal.h1
-rw-r--r--mit-pthreads/net/res_internal.h1
-rw-r--r--mit-pthreads/net/serv_internal.h1
4 files changed, 4 insertions, 0 deletions
diff --git a/mit-pthreads/net/net_internal.h b/mit-pthreads/net/net_internal.h
index 10ece181a94..0dc5c866e5d 100644
--- a/mit-pthreads/net/net_internal.h
+++ b/mit-pthreads/net/net_internal.h
@@ -44,6 +44,7 @@ static char *rcsid = "$Id$";
#include <resolv.h>
#define NET_BUFSIZE 4096
+#undef ALIGN
#define ALIGN(p, t) ((char *)(((((long)(p) - 1) / sizeof(t)) + 1) * sizeof(t)))
#define SP(p, t, n) (ALIGN(p, t) + (n) * sizeof(t))
diff --git a/mit-pthreads/net/proto_internal.h b/mit-pthreads/net/proto_internal.h
index d40f77b519e..4ed06883f25 100644
--- a/mit-pthreads/net/proto_internal.h
+++ b/mit-pthreads/net/proto_internal.h
@@ -44,6 +44,7 @@ static char *rcsid = "$Id$";
#include <resolv.h>
#define PROTO_BUFSIZE 4096
+#undef ALIGN
#define ALIGN(p, t) ((char *)(((((long)(p) - 1) / sizeof(t)) + 1) * sizeof(t)))
#define SP(p, t, n) (ALIGN(p, t) + (n) * sizeof(t))
diff --git a/mit-pthreads/net/res_internal.h b/mit-pthreads/net/res_internal.h
index 4a4691bab84..24e70278644 100644
--- a/mit-pthreads/net/res_internal.h
+++ b/mit-pthreads/net/res_internal.h
@@ -44,6 +44,7 @@ static char *rcsid = "$Id$";
#include <resolv.h>
#define HOST_BUFSIZE 4096
+#undef ALIGN
#define ALIGN(p, t) ((char *)(((((long)(p) - 1) / sizeof(t)) + 1) * sizeof(t)))
#define SP(p, t, n) (ALIGN(p, t) + (n) * sizeof(t))
diff --git a/mit-pthreads/net/serv_internal.h b/mit-pthreads/net/serv_internal.h
index 1d933826083..60a7c02c2ea 100644
--- a/mit-pthreads/net/serv_internal.h
+++ b/mit-pthreads/net/serv_internal.h
@@ -44,6 +44,7 @@ static char *rcsid = "$Id$";
#include <resolv.h>
#define SERV_BUFSIZE 4096
+#undef ALIGN
#define ALIGN(p, t) ((char *)(((((long)(p) - 1) / sizeof(t)) + 1) * sizeof(t)))
#define SP(p, t, n) (ALIGN(p, t) + (n) * sizeof(t))