=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/error.c,v retrieving revision 1.4 retrieving revision 1.5 diff -c -r1.4 -r1.5 *** src/usr.bin/make/error.c 2000/10/13 08:29:20 1.4 --- src/usr.bin/make/error.c 2001/05/03 13:41:04 1.5 *************** *** 1,4 **** ! /* $OpenBSD: error.c,v 1.4 2000/10/13 08:29:20 espie Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 --- 1,5 ---- ! /* $OpenPackages$ */ ! /* $OpenBSD: error.c,v 1.5 2001/05/03 13:41:04 espie Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 *************** *** 47,54 **** #include #include "error.h" ! static void enomem __P((size_t)); /* * emalloc -- * malloc, but die on error. --- 48,61 ---- #include #include "error.h" ! #ifdef __GNUC__ ! #define UNUSED __attribute__((unused)) ! #else ! #define UNUSED ! #endif + static void enomem(size_t); + /* * emalloc -- * malloc, but die on error. *************** *** 112,118 **** void * hash_alloc(s, u) size_t s; ! void *u; { return ecalloc(s, 1); } --- 119,125 ---- void * hash_alloc(s, u) size_t s; ! void *u UNUSED; { return ecalloc(s, 1); } *************** *** 120,127 **** void hash_free(p, s, u) void *p; ! size_t s; ! void *u; { free(p); } --- 127,134 ---- void hash_free(p, s, u) void *p; ! size_t s UNUSED; ! void *u UNUSED; { free(p); } *************** *** 129,139 **** void * element_alloc(s, u) size_t s; ! void *u; { return emalloc(s); } ! /* * enomem -- * die when out of memory. --- 136,148 ---- void * element_alloc(s, u) size_t s; ! void *u UNUSED; { return emalloc(s); } ! ! ! /* * enomem -- * die when out of memory. *************** *** 162,167 **** --- 171,177 ---- exit(2); } + /* * enunlink -- * Remove a file carefully, avoiding directories. *************** *** 181,183 **** --- 191,194 ---- } return unlink(file); } +