nginx-0.0.10-2004-09-15-20:00:43 import
diff --git a/src/core/ngx_array.h b/src/core/ngx_array.h
index fadb203..a6a1c8a 100644
--- a/src/core/ngx_array.h
+++ b/src/core/ngx_array.h
@@ -41,7 +41,8 @@
ngx_test_null(a.elts, ngx_palloc(p, n * s), rc); \
a.nelts = 0; a.size = s; a.nalloc = n; a.pool = p;
-#define ngx_array_push ngx_push_array
+#define ngx_array_create ngx_create_array
+#define ngx_array_push ngx_push_array
#endif /* _NGX_ARRAY_H_INCLUDED_ */
diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h
index 09fd70e..63a42ef 100644
--- a/src/core/ngx_config.h
+++ b/src/core/ngx_config.h
@@ -84,11 +84,20 @@
#define NGX_OFF_T_LEN sizeof("-9223372036854775808") - 1
+#if (SOLARIS)
+
+/* TODO: auto_conf */
+#define NGX_ALIGN (_MAX_ALIGNMENT - 1) /* platform word */
+#define NGX_ALIGN_CAST (unsigned long) /* size of the pointer */
+
+#else
/* TODO: auto_conf */
#define NGX_ALIGN (sizeof(unsigned long) - 1) /* platform word */
#define NGX_ALIGN_CAST (unsigned long) /* size of the pointer */
+#endif
+
#define ngx_align(p) (char *) ((NGX_ALIGN_CAST p + NGX_ALIGN) & ~NGX_ALIGN)
