Remove UCB advertising clause and some compatibility defines.

diff --git a/emul/fnmatch.h b/emul/fnmatch.h
index 7a66a46d2fb9e23b5ad69cab1358bd538163d49e..9f65bc5849eb0cdbcf58828efc065f64e05dba67 100644 (file)
--- a/emul/fnmatch.h
+++ b/emul/fnmatch.h
@@ -10,11 +10,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.
  *
@@ -44,8 +40,6 @@
 #define        FNM_PERIOD      0x04    /* Period must be matched by period. */
 #define        FNM_LEADING_DIR 0x08    /* Ignore /<tail> after Imatch. */
 #define        FNM_CASEFOLD    0x10    /* Case insensitive search. */
-#define        FNM_IGNORECASE  FNM_CASEFOLD
-#define        FNM_FILE_NAME   FNM_PATHNAME
 
 int     fnmatch __P((const char *, const char *, int));