summaryrefslogtreecommitdiff
path: root/mit-pthreads
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2001-01-27 01:20:56 +0200
committermonty@donna.mysql.com <>2001-01-27 01:20:56 +0200
commita7c5b9c211cf0d5e1355ece0c65975c56b160bb1 (patch)
treebf79d814679a767435990f41e226728ee5927766 /mit-pthreads
parent5218a03a1d3780f765572eb2269aaec0bbf860c9 (diff)
downloadmariadb-git-a7c5b9c211cf0d5e1355ece0c65975c56b160bb1.tar.gz
Portability fixes for OPENBSD, OS2 and Windows
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))