diff -u acltestdir/build-aux/config.guess.orig acltestdir/build-aux/config.guess
--- acltestdir/build-aux/config.guess.orig	2010-09-29 14:42:00.000000000 -0500
+++ acltestdir/build-aux/config.guess	2010-09-30 11:51:36.000000000 -0500
@@ -1230,6 +1230,9 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
diff -u acltestdir/build-aux/config.sub.orig acltestdir/build-aux/config.sub
--- acltestdir/build-aux/config.sub.orig	2010-09-29 14:42:00.000000000 -0500
+++ acltestdir/build-aux/config.sub	2010-09-30 11:51:03.000000000 -0500
@@ -839,6 +839,12 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
diff -u acltestdir/gllib/acl-internal.h.orig acltestdir/gllib/acl-internal.h
--- acltestdir/gllib/acl-internal.h.orig	2010-08-10 19:25:14.000000000 -0500
+++ acltestdir/gllib/acl-internal.h	2010-09-30 12:31:01.000000000 -0500
@@ -26,6 +26,12 @@
 #if HAVE_SYS_ACL_H
 # include <sys/acl.h>
 #endif
+#ifdef __TANDEM
+typedef struct acl aclent_t;
+#define SETACL ACL_SET
+#define GETACL ACL_GET
+#define MODE_INSIDE_ACL 1
+#endif
 #if defined HAVE_ACL && ! defined GETACLCNT && defined ACL_CNT
 # define GETACLCNT ACL_CNT
 #endif
diff -u acltestdir/gllib/copy-acl.c.orig acltestdir/gllib/copy-acl.c
--- acltestdir/gllib/copy-acl.c.orig	2010-08-10 19:25:14.000000000 -0500
+++ acltestdir/gllib/copy-acl.c	2010-09-30 13:16:13.000000000 -0500
@@ -290,7 +290,11 @@
     {
       count = (source_desc != -1
                ? facl (source_desc, GETACLCNT, 0, NULL)
+#ifdef __TANDEM /* picky compiler */
+               : acl ((char *)src_name, GETACLCNT, 0, NULL));
+#else
                : acl (src_name, GETACLCNT, 0, NULL));
+#endif
 
       if (count < 0)
         {
@@ -319,7 +323,11 @@
 
       if ((source_desc != -1
            ? facl (source_desc, GETACL, count, entries)
+#ifdef __TANDEM /* picky compiler */
+           : acl ((char*)src_name, GETACL, count, entries))
+#else
            : acl (src_name, GETACL, count, entries))
+#endif
           == count)
         break;
       /* Huh? The number of ACL entries changed since the last call.
@@ -354,7 +362,11 @@
     {
       ret = (dest_desc != -1
              ? facl (dest_desc, SETACL, count, entries)
+#ifdef __TANDEM /* picky compiler */
+             : acl ((char *)dst_name, SETACL, count, entries));
+#else
              : acl (dst_name, SETACL, count, entries));
+#endif
       if (ret < 0 && saved_errno == 0)
         {
           saved_errno = errno;
diff -u acltestdir/gllib/errno.in.h.orig acltestdir/gllib/errno.in.h
--- acltestdir/gllib/errno.in.h.orig	2010-03-30 05:01:15.000000000 -0500
+++ acltestdir/gllib/errno.in.h	2010-09-30 14:40:30.000000000 -0500
@@ -77,6 +77,8 @@
 #  define EREMOTE         10071  /* not required by POSIX */
 #  define GNULIB_defined_ESOCK 1
 
+# elif defined __TANDEM /* ToDo */
+#  define EDQUOT          10069
 # endif
 
 
diff -u acltestdir/gllib/file-has-acl.c.orig acltestdir/gllib/file-has-acl.c
--- acltestdir/gllib/file-has-acl.c.orig	2010-01-01 03:50:43.000000000 -0600
+++ acltestdir/gllib/file-has-acl.c	2010-09-30 12:35:34.000000000 -0500
@@ -397,7 +397,11 @@
 
         for (;;)
           {
+#ifdef __TANDEM
+            count = acl ((char *)name, GETACLCNT, 0, NULL);
+#else
             count = acl (name, GETACLCNT, 0, NULL);
+#endif
 
             if (count < 0)
               {
@@ -423,7 +427,11 @@
                 errno = ENOMEM;
                 return -1;
               }
+#ifdef __TANDEM /* picky compiler */
+            if (acl ((char *)name, GETACL, count, entries) == count)
+#else
             if (acl (name, GETACL, count, entries) == count)
+#endif
               {
                 if (acl_nontrivial (count, entries))
                   {
diff -u acltestdir/gllib/set-mode-acl.c.orig acltestdir/gllib/set-mode-acl.c
--- acltestdir/gllib/set-mode-acl.c.orig	2010-03-06 04:00:52.000000000 -0600
+++ acltestdir/gllib/set-mode-acl.c	2010-09-30 12:33:22.000000000 -0500
@@ -384,7 +384,11 @@
     if (desc != -1)
       ret = facl (desc, SETACL, sizeof (entries) / sizeof (aclent_t), entries);
     else
+#ifdef __TANDEM
+      ret = acl ((char *)name, SETACL, sizeof (entries) / sizeof (aclent_t), entries);
+#else
       ret = acl (name, SETACL, sizeof (entries) / sizeof (aclent_t), entries);
+#endif
     if (ret < 0)
       {
         if (errno == ENOSYS || errno == EOPNOTSUPP)
diff -u acltestdir/gllib/stdint.in.h.orig acltestdir/gllib/stdint.in.h
--- acltestdir/gllib/stdint.in.h.orig	2010-03-30 05:01:15.000000000 -0500
+++ acltestdir/gllib/stdint.in.h	2010-09-30 12:56:01.000000000 -0500
@@ -278,7 +278,11 @@
 /* Verify that intmax_t and uintmax_t have the same size.  Too much code
    breaks if this is not the case.  If this check fails, the reason is likely
    to be found in the autoconf macros.  */
+#ifdef __TANDEM /* keep line below 80 chars! */
+typedef int _verify_intmax_size[2*(sizeof(intmax_t) == sizeof(uintmax_t))-1];
+#else
 typedef int _verify_intmax_size[2 * (sizeof (intmax_t) == sizeof (uintmax_t)) - 1];
+#endif
 
 /* 7.18.2. Limits of specified-width integer types */
 
diff -u acltestdir/gllib/stdlib.in.h.orig acltestdir/gllib/stdlib.in.h
--- acltestdir/gllib/stdlib.in.h.orig	2010-10-01 06:10:08.000000000 -0500
+++ acltestdir/gllib/stdlib.in.h	2010-10-01 06:14:18.000000000 -0500
@@ -72,7 +72,10 @@
 };
 #endif
 
-#if (@GNULIB_MKSTEMP@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+/* __TANDEM (can't #ifdef here): keep lines shorted than 800 chars! */
+#if (@GNULIB_MKSTEMP@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && \
+	! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && \
+	! defined __CYGWIN__)
 /* On MacOS X 10.3, only <unistd.h> declares mkstemp.  */
 /* On Cygwin 1.7.1, only <unistd.h> declares getsubopt.  */
 /* But avoid namespace pollution on glibc systems and native Windows.  */
