X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-winsz1.m4;h=52653b74b8cf21726c72042de1ebb57a470eeb50;hb=a3a70ebafd7f2fdc069d43e8a26fc246dd7fe5bb;hp=0fcb46c754fef8e3412d15d52a1ce5a78c7ab44f;hpb=a751838451e58deb9816b34c2a6f218f1ebe0baf;p=gnulib.git

diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4
index 0fcb46c75..52653b74b 100644
--- a/m4/jm-winsz1.m4
+++ b/m4/jm-winsz1.m4
@@ -1,6 +1,12 @@
-#serial 6
+#serial 9
+
+# Copyright (C) 1996, 1999, 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 dnl From Jim Meyering and Paul Eggert.
-AC_DEFUN([jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
+AC_DEFUN([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
 [AC_REQUIRE([AC_SYS_POSIX_TERMIOS])
  AC_CACHE_CHECK([whether use of TIOCGWINSZ requires termios.h],
 	        jm_cv_sys_tiocgwinsz_needs_termios_h,
@@ -18,19 +24,21 @@ AC_DEFUN([jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
   ])
 ])
 
-AC_DEFUN([jm_WINSIZE_IN_PTEM],
+AC_DEFUN([gl_WINSIZE_IN_PTEM],
   [AC_REQUIRE([AC_SYS_POSIX_TERMIOS])
    AC_CACHE_CHECK([whether use of struct winsize requires sys/ptem.h],
      jm_cv_sys_struct_winsize_needs_sys_ptem_h,
      [jm_cv_sys_struct_winsize_needs_sys_ptem_h=yes
       if test $ac_cv_sys_posix_termios = yes; then
-	AC_TRY_COMPILE([#include <termios.h>]
-	  [struct winsize x;],
+	AC_TRY_COMPILE([#include <termios.h>],
+	  [struct winsize x;
+	   if (sizeof x > 0) return 0;],
           [jm_cv_sys_struct_winsize_needs_sys_ptem_h=no])
       fi
       if test $jm_cv_sys_struct_winsize_needs_sys_ptem_h = yes; then
 	AC_TRY_COMPILE([#include <sys/ptem.h>],
-	  [struct winsize x;],
+	  [struct winsize x;
+	   if (sizeof x > 0) return 0;],
 	  [], [jm_cv_sys_struct_winsize_needs_sys_ptem_h=no])
       fi])
    if test $jm_cv_sys_struct_winsize_needs_sys_ptem_h = yes; then