Merge branch 'mirbsd'
authormirabilos <m@mirbsd.org>
Sat, 22 Oct 2016 00:58:02 +0000 (02:58 +0200)
committermirabilos <m@mirbsd.org>
Sat, 22 Oct 2016 00:58:02 +0000 (02:58 +0200)
m4/longdouble.m4
src/add.c

index 40cd7ce..31ac250 100644 (file)
@@ -10,18 +10,8 @@ dnl Prerequisite: AC_PROG_CC
 
 AC_DEFUN([gt_TYPE_LONGDOUBLE],
 [
-  AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
-    [if test "$GCC" = yes; then
-       gt_cv_c_long_double=yes
-     else
-       AC_TRY_COMPILE([
-         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
-         long double foo = 0.0;
-         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
-         int array [2*(sizeof(long double) >= sizeof(double)) - 1];
-         ], ,
-         gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
-     fi])
+  AC_CHECK_SIZEOF(long double)
+  gt_cv_c_long_double=$ac_cv_type_long_double
   if test $gt_cv_c_long_double = yes; then
     AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
   fi
index 42ded0a..0e76594 100644 (file)
--- a/src/add.c
+++ b/src/add.c
@@ -533,7 +533,7 @@ add (int argc, char **argv)
                        }
                        Register (entries, finfo.file, "0",
                                  timestamp ? timestamp :
-                                  vers->ts_user_ists ? "locally-added" : vers->ts_user,
+                                  vers->ts_user_ists ? "locally added" : vers->ts_user,
                                  vers->options, vers->tag, vers->date, NULL);
                        if (timestamp) free (timestamp);
 #ifdef SERVER_SUPPORT