Relicensed dump/restore under the revised BSD license, as per ftp://ftp.cs.berkeley...

[dump.git] / compat / include / compatglob.h

diff --git a/compat/include/compatglob.h b/compat/include/compatglob.h
index 2ccbbe496741c1ed50c4479e0748142a9565e513..df2a536f0436cef281b11be6f208072ec1854b70 100644 (file)
--- a/compat/include/compatglob.h
+++ b/compat/include/compatglob.h
@@ -2,9 +2,10 @@
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
- *     Stelian Pop <pop@cybercable.fr>, 1999 
+ *     Stelian Pop <stelian@popies.net>, 1999-2000
+ *     Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  *
- *     $Id: compatglob.h,v 1.3 1999/10/13 09:57:18 stelian Exp $
+ *     $Id: compatglob.h,v 1.9 2003/03/30 15:40:34 stelian Exp $
  */
 
 /*
@@ -22,11 +23,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.
  *
@@ -43,8 +40,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _GLOB_H_
-#define        _GLOB_H_
+#ifndef _COMPATGLOB_H_
+#define        _COMPATGLOB_H_
 
 #include <config.h>
 
@@ -98,6 +95,6 @@ int   glob __P((const char *, int, int (*)(const char *, int), glob_t *));
 void   globfree __P((glob_t *));
 __END_DECLS
 
-#endif /* !_GLOB_H_ */
-
 #endif /* HAVE_GLOB */
+
+#endif /* !_COMPATGLOB_H_ */