summaryrefslogtreecommitdiffstats
path: root/gl
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2008-02-15 10:58:01 +0100
committerWerner Koch <wk@gnupg.org>2008-02-15 10:58:01 +0100
commit57d9ea99d94974c1d54517ae58fc24e761e66f2a (patch)
tree4999338a9b0a83395795a35780abaa76f2a27cfa /gl
parentPoems for AllowSetForegroundWindow (W32) (diff)
downloadgnupg2-57d9ea99d94974c1d54517ae58fc24e761e66f2a.tar.xz
gnupg2-57d9ea99d94974c1d54517ae58fc24e761e66f2a.zip
Preparing a test release
Diffstat (limited to 'gl')
-rw-r--r--gl/allocsa.h4
-rw-r--r--gl/m4/allocsa.m42
-rw-r--r--gl/m4/gnulib-comp.m41
3 files changed, 3 insertions, 4 deletions
diff --git a/gl/allocsa.h b/gl/allocsa.h
index 4c2affef5..0572d1ba7 100644
--- a/gl/allocsa.h
+++ b/gl/allocsa.h
@@ -105,14 +105,14 @@ enum
among all elementary types. */
sa_alignment_long = sa_alignof (long),
sa_alignment_double = sa_alignof (double),
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
sa_alignment_longlong = sa_alignof (long long),
#endif
#ifdef HAVE_LONG_DOUBLE
sa_alignment_longdouble = sa_alignof (long double),
#endif
sa_alignment_max = ((sa_alignment_long - 1) | (sa_alignment_double - 1)
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
| (sa_alignment_longlong - 1)
#endif
#ifdef HAVE_LONG_DOUBLE
diff --git a/gl/m4/allocsa.m4 b/gl/m4/allocsa.m4
index 474862fe3..9a778d590 100644
--- a/gl/m4/allocsa.m4
+++ b/gl/m4/allocsa.m4
@@ -10,6 +10,6 @@ AC_DEFUN([gl_ALLOCSA],
dnl @ALLOCA@ and @LTALLOCA@.
AC_REQUIRE([gl_FUNC_ALLOCA])
AC_REQUIRE([gl_EEMALLOC])
- AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
+ AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
AC_REQUIRE([gt_TYPE_LONGDOUBLE])
])
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index c23621bb6..beb7d15d0 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -71,7 +71,6 @@ AC_DEFUN([gl_FILE_LIST], [
m4/allocsa.m4
m4/eealloc.m4
m4/longdouble.m4
- m4/longlong.m4
m4/mkdtemp.m4
m4/setenv.m4
m4/size_max.m4