diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 16:18:56 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 16:18:56 +1100 |
| commit | 7f24a0e64774e6566242f44b0f06ab06607d0c97 (patch) | |
| tree | f6b8d04689e1c7d6b6b5e761dfaca9b3d8d64273 /openbsd-compat/glob.h | |
| parent | 80c0d7eb885d244d4745b55a392ee07b03e41676 (diff) | |
- (dtucker) [openbsd-compat/{LOTS}] Move the "OPENBSD ORIGINAL" markers to
after the copyright notices. Having them at the top next to the CVSIDs
guarantees a conflict for each and every sync.
Diffstat (limited to 'openbsd-compat/glob.h')
| -rw-r--r-- | openbsd-compat/glob.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h index 3428b2013..5d80073d3 100644 --- a/openbsd-compat/glob.h +++ b/openbsd-compat/glob.h | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | /* OPENBSD ORIGINAL: include/glob.h */ | ||
| 2 | |||
| 3 | /* $OpenBSD: glob.h,v 1.8 2003/06/02 19:34:12 millert Exp $ */ | 1 | /* $OpenBSD: glob.h,v 1.8 2003/06/02 19:34:12 millert Exp $ */ |
| 4 | /* $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $ */ | 2 | /* $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $ */ |
| 5 | 3 | ||
| @@ -37,6 +35,8 @@ | |||
| 37 | * @(#)glob.h 8.1 (Berkeley) 6/2/93 | 35 | * @(#)glob.h 8.1 (Berkeley) 6/2/93 |
| 38 | */ | 36 | */ |
| 39 | 37 | ||
| 38 | /* OPENBSD ORIGINAL: include/glob.h */ | ||
| 39 | |||
| 40 | #if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || \ | 40 | #if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || \ |
| 41 | !defined(GLOB_HAS_GL_MATCHC) | 41 | !defined(GLOB_HAS_GL_MATCHC) |
| 42 | 42 | ||