2 files changed, 13 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index b0c86e26d..dbae4398e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -127,6 +127,10 @@
      [openbsd-compat/sys-queue.h]
      Enable QUEUE_MACRO_DEBUG on DIAGNOSTIC kernels.
      Input and okays from krw@, millert@, otto@, deraadt@, miod@.
+   - millert@cvs.openbsd.org 2004/10/07 16:56:11
+     GLOB_NOESCAPE is POSIX so move it out of the #ifndef _POSIX_SOURCE
+     block.
+     (NB. mostly an RCS ID sync, as portable strips out the conditionals)
  - (djm) [regress/sftp-cmds.sh]
    Use more restrictive glob to pick up test files from /bin - some platforms
    ship broken symlinks there which could spoil the test.
@@ -3403,4 +3407,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4792 2007/10/26 06:46:31 djm Exp $
+$Id: ChangeLog,v 1.4793 2007/10/26 06:48:13 djm Exp $
diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
index 9ba07f76e..9f53f7a21 100644
--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: glob.h,v 1.9 2004/10/07 16:56:11 millert Exp $        */
+/*      $OpenBSD: glob.h,v 1.10 2005/12/13 00:35:22 millert Exp $       */
 /*      $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $     */
 
 /*
@@ -66,7 +66,6 @@ typedef struct {
         int (*gl_stat)(const char *, struct stat *);
 } glob_t;
 
-/* Flags */
 #define GLOB_APPEND     0x0001  /* Append to output from previous call. */
 #define GLOB_DOOFFS     0x0002  /* Use gl_offs. */
 #define GLOB_ERR        0x0004  /* Return on error. */
@@ -75,6 +74,13 @@ typedef struct {
 #define GLOB_NOSORT     0x0020  /* Don't sort. */
 #define GLOB_NOESCAPE   0x1000  /* Disable backslash escaping. */
 
+/* Error values returned by glob(3) */
+#define GLOB_NOSPACE    (-1)    /* Malloc call failed. */
+#define GLOB_ABORTED    (-2)    /* Unignored error. */
+#define GLOB_NOMATCH    (-3)    /* No match and GLOB_NOCHECK not set. */
+#define GLOB_NOSYS      (-4)    /* Function not supported. */
+#define GLOB_ABEND      GLOB_ABORTED
+
 #define GLOB_ALTDIRFUNC 0x0040  /* Use alternately specified directory funcs. */
 #define GLOB_BRACE      0x0080  /* Expand braces ala csh. */
 #define GLOB_MAGCHAR    0x0100  /* Pattern had globbing characters. */
@@ -83,13 +89,6 @@ typedef struct {
 #define GLOB_TILDE      0x0800  /* Expand tilde names from the passwd file. */
 #define GLOB_LIMIT      0x2000  /* Limit pattern match output to ARG_MAX */
 
-/* Error values returned by glob(3) */
-#define GLOB_NOSPACE    (-1)    /* Malloc call failed. */
-#define GLOB_ABORTED    (-2)    /* Unignored error. */
-#define GLOB_NOMATCH    (-3)    /* No match and GLOB_NOCHECK not set. */
-#define GLOB_NOSYS      (-4)    /* Function not supported. */
-#define GLOB_ABEND      GLOB_ABORTED
-
 int     glob(const char *, int, int (*)(const char *, int), glob_t *);
 void    globfree(glob_t *);