[Glibc-bsd-commits] r6096 - in trunk: glibc-ports-2.23/kfreebsd/bits glibc-ports-2.23/kfreebsd/fbtl/bits glibc-ports-2.24/kfreebsd/bits glibc-ports-2.24/kfreebsd/fbtl/bits

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2016-07-19 16:09:03 +0000 (Tue, 19 Jul 2016)
New Revision: 6096

Removed:
   trunk/glibc-ports-2.23/kfreebsd/bits/local_lim.h
   trunk/glibc-ports-2.24/kfreebsd/bits/local_lim.h
Modified:
   trunk/glibc-ports-2.23/kfreebsd/fbtl/bits/local_lim.h
   trunk/glibc-ports-2.24/kfreebsd/fbtl/bits/local_lim.h
Log:
Drop bits/local_lim.h as fbtl/bits/local_lim.h is used in practice. Define HOST_NAME_MAX and LOGIN_NAME_MAX.


Deleted: trunk/glibc-ports-2.23/kfreebsd/bits/local_lim.h
===================================================================
--- trunk/glibc-ports-2.23/kfreebsd/bits/local_lim.h	2016-07-19 09:19:30 UTC (rev 6095)
+++ trunk/glibc-ports-2.23/kfreebsd/bits/local_lim.h	2016-07-19 16:09:03 UTC (rev 6096)
@@ -1,25 +0,0 @@
-/* Minimum guaranteed maximum values for system limits.  kFreeBSD version.
-   Copyright (C) 2011 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sys/param.h>
-
-/* BSD userland provides MAXHOSTNAMELEN via <sys/param.h>.  GNU
-   userland provides HOST_NAME_MAX via <limits.h>.  This makes
-   both worlds happy.  */
-#define HOST_NAME_MAX MAXHOSTNAMELEN

Modified: trunk/glibc-ports-2.23/kfreebsd/fbtl/bits/local_lim.h
===================================================================
--- trunk/glibc-ports-2.23/kfreebsd/fbtl/bits/local_lim.h	2016-07-19 09:19:30 UTC (rev 6095)
+++ trunk/glibc-ports-2.23/kfreebsd/fbtl/bits/local_lim.h	2016-07-19 16:09:03 UTC (rev 6096)
@@ -47,5 +47,14 @@
 /* Maximum number of timer expiration overruns.  */
 #define DELAYTIMER_MAX	2147483647
 
+/* Maximum tty name length.  */
+/* Already defined in <sys/param.h>.  */
+
+/* Maximum login name length.  */
+#define LOGIN_NAME_MAX		(MAXLOGNAME - 1)
+
+/* Maximum host name length.  */
+#define HOST_NAME_MAX		MAXHOSTNAMELEN
+
 /* Maximum value the semaphore can have.  */
 #define SEM_VALUE_MAX   (2147483647)

Deleted: trunk/glibc-ports-2.24/kfreebsd/bits/local_lim.h
===================================================================
--- trunk/glibc-ports-2.24/kfreebsd/bits/local_lim.h	2016-07-19 09:19:30 UTC (rev 6095)
+++ trunk/glibc-ports-2.24/kfreebsd/bits/local_lim.h	2016-07-19 16:09:03 UTC (rev 6096)
@@ -1,25 +0,0 @@
-/* Minimum guaranteed maximum values for system limits.  kFreeBSD version.
-   Copyright (C) 2011 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sys/param.h>
-
-/* BSD userland provides MAXHOSTNAMELEN via <sys/param.h>.  GNU
-   userland provides HOST_NAME_MAX via <limits.h>.  This makes
-   both worlds happy.  */
-#define HOST_NAME_MAX MAXHOSTNAMELEN

Modified: trunk/glibc-ports-2.24/kfreebsd/fbtl/bits/local_lim.h
===================================================================
--- trunk/glibc-ports-2.24/kfreebsd/fbtl/bits/local_lim.h	2016-07-19 09:19:30 UTC (rev 6095)
+++ trunk/glibc-ports-2.24/kfreebsd/fbtl/bits/local_lim.h	2016-07-19 16:09:03 UTC (rev 6096)
@@ -47,5 +47,14 @@
 /* Maximum number of timer expiration overruns.  */
 #define DELAYTIMER_MAX	2147483647
 
+/* Maximum tty name length.  */
+/* Already defined in <sys/param.h>.  */
+
+/* Maximum login name length.  */
+#define LOGIN_NAME_MAX		(MAXLOGNAME - 1)
+
+/* Maximum host name length.  */
+#define HOST_NAME_MAX		MAXHOSTNAMELEN
+
 /* Maximum value the semaphore can have.  */
 #define SEM_VALUE_MAX   (2147483647)