PERFORCE change 125799 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=125799

Change 125799 by marcel at marcel_xcllnt on 2007/08/29 02:21:26

	More of the same merge fodder.

Affected files ...

.. //depot/projects/gdb/contrib/pf/pflogd/pidfile.c#6 edit
.. //depot/projects/gdb/contrib/pf/pflogd/pidfile.h#3 edit
.. //depot/projects/ia64/contrib/pf/pflogd/pidfile.c#6 edit
.. //depot/projects/ia64/contrib/pf/pflogd/pidfile.h#3 edit
.. //depot/projects/powerpc/contrib/pf/pflogd/pidfile.c#3 edit
.. //depot/projects/powerpc/contrib/pf/pflogd/pidfile.h#3 edit
.. //depot/projects/tty/contrib/pf/pflogd/pidfile.c#5 edit
.. //depot/projects/tty/contrib/pf/pflogd/pidfile.h#3 edit

Differences ...

==== //depot/projects/gdb/contrib/pf/pflogd/pidfile.c#6 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.4 2005/05/03 16:55:20 mlaier Exp $ */
+/*	$FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.6 2007/07/03 14:08:49 mlaier Exp $ */
 /*	$OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $	*/
 /*	$NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $	*/
 

==== //depot/projects/gdb/contrib/pf/pflogd/pidfile.h#3 (text+ko) ====

@@ -1,1 +1,3 @@
+/* $FreeBSD: src/contrib/pf/pflogd/pidfile.h,v 1.3 2007/07/03 14:08:49 mlaier Exp $ */
+
 int pidfile(const char *);

==== //depot/projects/ia64/contrib/pf/pflogd/pidfile.c#6 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.4 2005/05/03 16:55:20 mlaier Exp $ */
+/*	$FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.6 2007/07/03 14:08:49 mlaier Exp $ */
 /*	$OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $	*/
 /*	$NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $	*/
 

==== //depot/projects/ia64/contrib/pf/pflogd/pidfile.h#3 (text+ko) ====

@@ -1,1 +1,3 @@
+/* $FreeBSD: src/contrib/pf/pflogd/pidfile.h,v 1.3 2007/07/03 14:08:49 mlaier Exp $ */
+
 int pidfile(const char *);

==== //depot/projects/powerpc/contrib/pf/pflogd/pidfile.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.4 2005/05/03 16:55:20 mlaier Exp $ */
+/*	$FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.6 2007/07/03 14:08:49 mlaier Exp $ */
 /*	$OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $	*/
 /*	$NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $	*/
 

==== //depot/projects/powerpc/contrib/pf/pflogd/pidfile.h#3 (text+ko) ====

@@ -1,1 +1,3 @@
+/* $FreeBSD: src/contrib/pf/pflogd/pidfile.h,v 1.3 2007/07/03 14:08:49 mlaier Exp $ */
+
 int pidfile(const char *);

==== //depot/projects/tty/contrib/pf/pflogd/pidfile.c#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.4 2005/05/03 16:55:20 mlaier Exp $ */
+/*	$FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.6 2007/07/03 14:08:49 mlaier Exp $ */
 /*	$OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $	*/
 /*	$NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $	*/
 

==== //depot/projects/tty/contrib/pf/pflogd/pidfile.h#3 (text+ko) ====

@@ -1,1 +1,3 @@
+/* $FreeBSD: src/contrib/pf/pflogd/pidfile.h,v 1.3 2007/07/03 14:08:49 mlaier Exp $ */
+
 int pidfile(const char *);