Skip to content

Commit

Permalink
Make macros to prevent double-inclusion in headers consistent.
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Apr 29, 2007
1 parent f956738 commit e0173ad
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions diffcore.h
@@ -1,8 +1,8 @@
/* /*
* Copyright (C) 2005 Junio C Hamano * Copyright (C) 2005 Junio C Hamano
*/ */
#ifndef _DIFFCORE_H_ #ifndef DIFFCORE_H
#define _DIFFCORE_H_ #define DIFFCORE_H


/* This header file is internal between diff.c and its diff transformers /* This header file is internal between diff.c and its diff transformers
* (e.g. diffcore-rename, diffcore-pickaxe). Never include this header * (e.g. diffcore-rename, diffcore-pickaxe). Never include this header
Expand Down
6 changes: 3 additions & 3 deletions exec_cmd.h
@@ -1,10 +1,10 @@
#ifndef __GIT_EXEC_CMD_H_ #ifndef GIT_EXEC_CMD_H
#define __GIT_EXEC_CMD_H_ #define GIT_EXEC_CMD_H


extern void git_set_exec_path(const char *exec_path); extern void git_set_exec_path(const char *exec_path);
extern const char* git_exec_path(void); extern const char* git_exec_path(void);
extern int execv_git_cmd(const char **argv); /* NULL terminated */ extern int execv_git_cmd(const char **argv); /* NULL terminated */
extern int execl_git_cmd(const char *cmd, ...); extern int execl_git_cmd(const char *cmd, ...);




#endif /* __GIT_EXEC_CMD_H_ */ #endif /* GIT_EXEC_CMD_H */
6 changes: 3 additions & 3 deletions path-list.h
@@ -1,5 +1,5 @@
#ifndef _PATH_LIST_H_ #ifndef PATH_LIST_H
#define _PATH_LIST_H_ #define PATH_LIST_H


struct path_list_item { struct path_list_item {
char *path; char *path;
Expand All @@ -19,4 +19,4 @@ void path_list_clear(struct path_list *list, int free_items);
struct path_list_item *path_list_insert(const char *path, struct path_list *list); struct path_list_item *path_list_insert(const char *path, struct path_list *list);
struct path_list_item *path_list_lookup(const char *path, struct path_list *list); struct path_list_item *path_list_lookup(const char *path, struct path_list *list);


#endif /* _PATH_LIST_H_ */ #endif /* PATH_LIST_H */
4 changes: 2 additions & 2 deletions progress.h
@@ -1,5 +1,5 @@
#ifndef __progress_h__ #ifndef PROGRESS_H
#define __progress_h__ #define PROGRESS_H


struct progress { struct progress {
const char *prefix; const char *prefix;
Expand Down

0 comments on commit e0173ad

Please sign in to comment.