Skip to content

Commit e0173ad

Browse files
author
Junio C Hamano
committed
Make macros to prevent double-inclusion in headers consistent.
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent f956738 commit e0173ad

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

diffcore.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright (C) 2005 Junio C Hamano
33
*/
4-
#ifndef _DIFFCORE_H_
5-
#define _DIFFCORE_H_
4+
#ifndef DIFFCORE_H
5+
#define DIFFCORE_H
66

77
/* This header file is internal between diff.c and its diff transformers
88
* (e.g. diffcore-rename, diffcore-pickaxe). Never include this header

exec_cmd.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#ifndef __GIT_EXEC_CMD_H_
2-
#define __GIT_EXEC_CMD_H_
1+
#ifndef GIT_EXEC_CMD_H
2+
#define GIT_EXEC_CMD_H
33

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

99

10-
#endif /* __GIT_EXEC_CMD_H_ */
10+
#endif /* GIT_EXEC_CMD_H */

path-list.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef _PATH_LIST_H_
2-
#define _PATH_LIST_H_
1+
#ifndef PATH_LIST_H
2+
#define PATH_LIST_H
33

44
struct path_list_item {
55
char *path;
@@ -19,4 +19,4 @@ void path_list_clear(struct path_list *list, int free_items);
1919
struct path_list_item *path_list_insert(const char *path, struct path_list *list);
2020
struct path_list_item *path_list_lookup(const char *path, struct path_list *list);
2121

22-
#endif /* _PATH_LIST_H_ */
22+
#endif /* PATH_LIST_H */

progress.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef __progress_h__
2-
#define __progress_h__
1+
#ifndef PROGRESS_H
2+
#define PROGRESS_H
33

44
struct progress {
55
const char *prefix;

0 commit comments

Comments
 (0)