From b6bbc32e14f98a2d44a7656c8aefac3c69696d10 Mon Sep 17 00:00:00 2001 From: hniksic Date: Thu, 29 Nov 2001 10:55:52 -0800 Subject: [PATCH] [svn] Guard against header files getting included twice. --- src/ChangeLog | 4 ++++ src/cookies.h | 5 +++++ src/fnmatch.h | 6 +++--- src/gen-md5.h | 5 +++++ src/gen_sslfunc.h | 4 ++++ src/hash.h | 5 +++++ src/headers.h | 5 +++++ src/html-parse.h | 5 +++++ src/netrc.h | 5 +++++ src/progress.h | 5 +++++ src/res.h | 5 +++++ 11 files changed, 51 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3c6bff9a..fc445bc3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2001-11-29 Hrvoje Niksic + + * headers: Guard against header files being included twice. + 2001-11-29 Hrvoje Niksic * gen-md5.c: Use unsigned char * as the buffer argument to diff --git a/src/cookies.h b/src/cookies.h index 2669712f..c660a200 100644 --- a/src/cookies.h +++ b/src/cookies.h @@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License along with Wget; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef COOKIES_H +#define COOKIES_H + /* struct cookie is not exported; this file only exports functions for manipulating cookie contents. */ @@ -28,3 +31,5 @@ void load_cookies PARAMS ((const char *)); void save_cookies PARAMS ((const char *)); void cookies_cleanup PARAMS ((void)); + +#endif /* COOKIES_H */ diff --git a/src/fnmatch.h b/src/fnmatch.h index ada4d57a..37a7faea 100644 --- a/src/fnmatch.h +++ b/src/fnmatch.h @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with Wget; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef MTCH_H -#define MTCH_H +#ifndef FNMATCH_H +#define FNMATCH_H /* Bits set in the FLAGS argument to `fnmatch'. */ #define FNM_PATHNAME (1 << 0) /* No wildcard can ever match `/'. */ @@ -32,4 +32,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ int fnmatch PARAMS ((const char *, const char *, int)); int has_wildcards_p PARAMS ((const char *)); -#endif /* MTCH_H */ +#endif /* FNMATCH_H */ diff --git a/src/gen-md5.h b/src/gen-md5.h index 85714380..cbac4085 100644 --- a/src/gen-md5.h +++ b/src/gen-md5.h @@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License along with Wget; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef GEN_MD5_H +#define GEN_MD5_H + typedef struct gen_md5_context gen_md5_context; /* Use a forward declaration so we don't have to include any of the @@ -30,3 +33,5 @@ int gen_md5_context_size PARAMS ((void)); void gen_md5_init PARAMS ((gen_md5_context *)); void gen_md5_update PARAMS ((const unsigned char *, int, gen_md5_context *)); void gen_md5_finish PARAMS ((gen_md5_context *, unsigned char *)); + +#endif /* GEN_MD5_H */ diff --git a/src/gen_sslfunc.h b/src/gen_sslfunc.h index 3c18f2fd..6a12e032 100644 --- a/src/gen_sslfunc.h +++ b/src/gen_sslfunc.h @@ -18,6 +18,9 @@ You should have received a copy of the GNU General Public License along with Wget; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef GEN_SSLFUNC_H +#define GEN_SSLFUNC_H + #ifdef HAVE_SSL # include #endif @@ -31,3 +34,4 @@ int ssl_iread PARAMS ((SSL *, char *, int)); int ssl_iwrite PARAMS ((SSL *, char *, int)); int ssl_printerrors PARAMS ((void)); +#endif /* GEN_SSLFUNC_H */ diff --git a/src/hash.h b/src/hash.h index fffe91b1..3da944eb 100644 --- a/src/hash.h +++ b/src/hash.h @@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License along with Wget; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef HASH_H +#define HASH_H + /* From XEmacs, and hence from Dragon book. */ #define GOOD_HASH 65599 /* prime number just over 2^16; Dragon book, p. 435 */ @@ -55,3 +58,5 @@ unsigned long string_hash PARAMS ((const void *)); int string_cmp PARAMS ((const void *, const void *)); struct hash_table *make_string_hash_table PARAMS ((int)); struct hash_table *make_nocase_string_hash_table PARAMS ((int)); + +#endif /* HASH_H */ diff --git a/src/headers.h b/src/headers.h index 8c959c5e..d22c92fb 100644 --- a/src/headers.h +++ b/src/headers.h @@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License along with Wget; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef HEADERS_H +#define HEADERS_H + enum { HG_OK, HG_ERROR, HG_EOF }; @@ -34,3 +37,5 @@ int header_strdup PARAMS ((const char *, void *)); int header_exists PARAMS ((const char *, void *)); int skip_lws PARAMS ((const char *)); + +#endif /* HEADERS_H */ diff --git a/src/html-parse.h b/src/html-parse.h index dc2cba7e..5ff33b3b 100644 --- a/src/html-parse.h +++ b/src/html-parse.h @@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License along with Wget; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef HTML_PARSE_H +#define HTML_PARSE_H + struct attr_pair { char *name; /* attribute name */ char *value; /* attribute value */ @@ -42,3 +45,5 @@ struct taginfo { void map_html_tags PARAMS ((const char *, int, const char **, const char **, void (*) (struct taginfo *, void *), void *)); + +#endif /* HTML_PARSE_H */ diff --git a/src/netrc.h b/src/netrc.h index 0d30749f..5f65a28e 100644 --- a/src/netrc.h +++ b/src/netrc.h @@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License along with Wget; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef NETRC_H +#define NETRC_H + typedef struct _acc_t { char *host; /* NULL if this is the default machine @@ -28,3 +31,5 @@ typedef struct _acc_t void search_netrc PARAMS((const char *, const char **, const char **, int)); void free_netrc PARAMS((acc_t *l)); + +#endif /* NETRC_H */ diff --git a/src/progress.h b/src/progress.h index bb0abad8..5566cb9a 100644 --- a/src/progress.h +++ b/src/progress.h @@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License along with Wget; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef PROGRESS_H +#define PROGRESS_H + int valid_progress_implementation_p PARAMS ((const char *)); void set_progress_implementation PARAMS ((const char *)); @@ -25,3 +28,5 @@ void progress_update PARAMS ((void *, long, long)); void progress_finish PARAMS ((void *, long)); RETSIGTYPE progress_handle_sigwinch PARAMS ((int)); + +#endif /* PROGRESS_H */ diff --git a/src/res.h b/src/res.h index 3b8b7647..5c859a6c 100644 --- a/src/res.h +++ b/src/res.h @@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef RES_H +#define RES_H + struct robot_specs; struct robot_specs *res_parse PARAMS ((const char *, int)); @@ -30,3 +33,5 @@ struct robot_specs *res_get_specs PARAMS ((const char *, int)); int res_retrieve_file PARAMS ((const char *, char **)); void res_cleanup PARAMS ((void)); + +#endif /* RES_H */ -- 2.39.2