Module Name: src
Committed By: pooka
Date: Thu Mar 14 21:31:36 UTC 2013
Modified Files:
src/lib/librumpuser: rumpuser_port.h
Log Message:
Refine previous: sys/sysmacros.h is where MIN/MAX comes from on Solaris,
so it needs to be included unconditionally.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/librumpuser/rumpuser_port.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser_port.h
diff -u src/lib/librumpuser/rumpuser_port.h:1.13 src/lib/librumpuser/rumpuser_port.h:1.14
--- src/lib/librumpuser/rumpuser_port.h:1.13 Thu Mar 14 20:42:57 2013
+++ src/lib/librumpuser/rumpuser_port.h Thu Mar 14 21:31:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_port.h,v 1.13 2013/03/14 20:42:57 pooka Exp $ */
+/* $NetBSD: rumpuser_port.h,v 1.14 2013/03/14 21:31:35 pooka Exp $ */
/*
* Portability header for non-NetBSD platforms.
@@ -76,9 +76,10 @@ getenv_r(const char *name, char *buf, si
}
#endif
-#if defined(__sun__) && !defined(HAVE_POSIX_MEMALIGN)
+#if defined(__sun__)
#include <sys/sysmacros.h>
+#if !defined(HAVE_POSIX_MEMALIGN)
/* Solarisa 10 has memalign() but no posix_memalign() */
#include <stdlib.h>
@@ -91,6 +92,7 @@ posix_memalign(void **ptr, size_t align,
return ENOMEM;
return 0;
}
+#endif /* !HAVE_POSIX_MEMALIGN */
#endif /* __sun__ */
#ifndef __RCSID
