diff options
| author | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
| commit | 2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (patch) | |
| tree | f64a4ace625514e94759878c0b94ab0a79805bbd /openbsd-compat/sys-queue.h | |
| parent | 3c190ec8e469477ea65fbf4cc83062c65c281434 (diff) | |
| parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) | |
Merge 4.3p2 to the trunk.
Diffstat (limited to 'openbsd-compat/sys-queue.h')
| -rw-r--r-- | openbsd-compat/sys-queue.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsd-compat/sys-queue.h b/openbsd-compat/sys-queue.h index c49a94650..402343324 100644 --- a/openbsd-compat/sys-queue.h +++ b/openbsd-compat/sys-queue.h | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | /* OPENBSD ORIGINAL: sys/sys/queue.h */ | ||
| 2 | |||
| 3 | /* $OpenBSD: queue.h,v 1.25 2004/04/08 16:08:21 henning Exp $ */ | 1 | /* $OpenBSD: queue.h,v 1.25 2004/04/08 16:08:21 henning Exp $ */ |
| 4 | /* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ | 2 | /* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ |
| 5 | 3 | ||
| @@ -34,6 +32,8 @@ | |||
| 34 | * @(#)queue.h 8.5 (Berkeley) 8/20/94 | 32 | * @(#)queue.h 8.5 (Berkeley) 8/20/94 |
| 35 | */ | 33 | */ |
| 36 | 34 | ||
| 35 | /* OPENBSD ORIGINAL: sys/sys/queue.h */ | ||
| 36 | |||
| 37 | #ifndef _FAKE_QUEUE_H_ | 37 | #ifndef _FAKE_QUEUE_H_ |
| 38 | #define _FAKE_QUEUE_H_ | 38 | #define _FAKE_QUEUE_H_ |
| 39 | 39 | ||