- djm@cvs.openbsd.org 2003/06/12 12:22:47

[openssh.git] / openbsd-compat / glob.h

diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
index b4c8f7aaa642f58b554f80d9cd3958c1055e078b..aceddbc48757cf1915be7702b0ea6ccd5bc63b7e 100644 (file)
--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: glob.h,v 1.5 2001/03/18 17:18:58 deraadt Exp $        */
+/*     $OpenBSD: glob.h,v 1.8 2003/06/02 19:34:12 millert Exp $        */
 /*     $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $     */
 
 /*
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -53,18 +49,18 @@ typedef struct {
        int gl_flags;           /* Copy of flags parameter to glob. */
        char **gl_pathv;        /* List of paths matching pattern. */
                                /* Copy of errfunc parameter to glob. */
-       int (*gl_errfunc) __P((const char *, int));
+       int (*gl_errfunc)(const char *, int);
 
        /*
         * Alternate filesystem access methods for glob; replacement
         * versions of closedir(3), readdir(3), opendir(3), stat(2)
         * and lstat(2).
         */
-       void (*gl_closedir) __P((void *));
-       struct dirent *(*gl_readdir) __P((void *));     
-       void *(*gl_opendir) __P((const char *));
-       int (*gl_lstat) __P((const char *, struct stat *));
-       int (*gl_stat) __P((const char *, struct stat *));
+       void (*gl_closedir)(void *);
+       struct dirent *(*gl_readdir)(void *);   
+       void *(*gl_opendir)(const char *);
+       int (*gl_lstat)(const char *, struct stat *);
+       int (*gl_stat)(const char *, struct stat *);
 } glob_t;
 
 /* Flags */
@@ -91,8 +87,8 @@ typedef struct {
 #define        GLOB_NOSYS      (-4)    /* Function not supported. */
 #define GLOB_ABEND     GLOB_ABORTED
 
-int    glob __P((const char *, int, int (*)(const char *, int), glob_t *));
-void   globfree __P((glob_t *));
+int    glob(const char *, int, int (*)(const char *, int), glob_t *);
+void   globfree(glob_t *);
 
 #endif /* !_GLOB_H_ */