From 0d2ba870c96d1b4b3d5fabfabe303bc6b1c989fd Mon Sep 17 00:00:00 2001 From: Ivy Foster Date: Sat, 3 Sep 2016 22:14:49 -0500 Subject: Do not #define _RESERVED_IDENTIFIERS Signed-off-by: Ivy Foster Signed-off-by: Allan McRae --- src/common/ini.h | 6 +++--- src/common/util-common.h | 6 +++--- src/pacman/callback.h | 6 +++--- src/pacman/check.h | 6 +++--- src/pacman/conf.h | 6 +++--- src/pacman/package.h | 6 +++--- src/pacman/pacman.h | 6 +++--- src/pacman/sighandler.h | 6 +++--- src/pacman/util.h | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/common/ini.h b/src/common/ini.h index 2b4f79d6..e03a83fd 100644 --- a/src/common/ini.h +++ b/src/common/ini.h @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -#ifndef _PM_INI_H -#define _PM_INI_H +#ifndef PM_INI_H +#define PM_INI_H typedef int (ini_parser_fn)(const char *file, int line, const char *section, char *key, char *value, void *data); int parse_ini(const char *file, ini_parser_fn cb, void *data); -#endif /* _PM_CONF_H */ +#endif /* PM_INI_H */ /* vim: set noet: */ diff --git a/src/common/util-common.h b/src/common/util-common.h index 9df6a709..14520944 100644 --- a/src/common/util-common.h +++ b/src/common/util-common.h @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef _PM_UTIL_COMMON_H -#define _PM_UTIL_COMMON_H +#ifndef PM_UTIL_COMMON_H +#define PM_UTIL_COMMON_H #include #include /* struct stat */ @@ -38,6 +38,6 @@ char *strndup(const char *s, size_t n); #define ARRAYSIZE(a) (sizeof (a) / sizeof (a[0])) -#endif /* _PM_UTIL_COMMON_H */ +#endif /* PM_UTIL_COMMON_H */ /* vim: set noet: */ diff --git a/src/pacman/callback.h b/src/pacman/callback.h index fc83fb70..ad395e9d 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -17,8 +17,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifndef _PM_CALLBACK_H -#define _PM_CALLBACK_H +#ifndef PM_CALLBACK_H +#define PM_CALLBACK_H #include /* off_t */ @@ -43,6 +43,6 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total); __attribute__((format(printf, 2, 0))) void cb_log(alpm_loglevel_t level, const char *fmt, va_list args); -#endif /* _PM_CALLBACK_H */ +#endif /* PM_CALLBACK_H */ /* vim: set noet: */ diff --git a/src/pacman/check.h b/src/pacman/check.h index 362a3525..5052376e 100644 --- a/src/pacman/check.h +++ b/src/pacman/check.h @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -#ifndef _PM_CHECK_H -#define _PM_CHECK_H +#ifndef PM_CHECK_H +#define PM_CHECK_H #include int check_pkg_fast(alpm_pkg_t *pkg); int check_pkg_full(alpm_pkg_t *pkg); -#endif /* _PM_CHECK_H */ +#endif /* PM_CHECK_H */ /* vim: set noet: */ diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 2aba8bf9..2ddeadb3 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -17,8 +17,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifndef _PM_CONF_H -#define _PM_CONF_H +#ifndef PM_CONF_H +#define PM_CONF_H #include @@ -234,6 +234,6 @@ void config_repo_free(config_repo_t *repo); int config_set_arch(const char *arch); int parseconfig(const char *file); -#endif /* _PM_CONF_H */ +#endif /* PM_CONF_H */ /* vim: set noet: */ diff --git a/src/pacman/package.h b/src/pacman/package.h index e3693300..3129a736 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -17,8 +17,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifndef _PM_PACKAGE_H -#define _PM_PACKAGE_H +#ifndef PM_PACKAGE_H +#define PM_PACKAGE_H #include @@ -31,6 +31,6 @@ void dump_pkg_changelog(alpm_pkg_t *pkg); void print_installed(alpm_db_t *db_local, alpm_pkg_t *pkg); int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status); -#endif /* _PM_PACKAGE_H */ +#endif /* PM_PACKAGE_H */ /* vim: set noet: */ diff --git a/src/pacman/pacman.h b/src/pacman/pacman.h index edb81b10..84f70a66 100644 --- a/src/pacman/pacman.h +++ b/src/pacman/pacman.h @@ -17,8 +17,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifndef _PM_PACMAN_H -#define _PM_PACMAN_H +#ifndef PM_PACMAN_H +#define PM_PACMAN_H #include @@ -40,6 +40,6 @@ int sync_prepare_execute(void); /* upgrade.c */ int pacman_upgrade(alpm_list_t *targets); -#endif /* _PM_PACMAN_H */ +#endif /* PM_PACMAN_H */ /* vim: set noet: */ diff --git a/src/pacman/sighandler.h b/src/pacman/sighandler.h index 3fddaee4..108a7e00 100644 --- a/src/pacman/sighandler.h +++ b/src/pacman/sighandler.h @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -#ifndef _PM_SIGHANDLER_H -#define _PM_SIGHANDLER_H +#ifndef PM_SIGHANDLER_H +#define PM_SIGHANDLER_H void install_segv_handler(void); void install_winch_handler(void); void install_soft_interrupt_handler(void); void remove_soft_interrupt_handler(void); -#endif /* _PM_SIGHANDLER_H */ +#endif /* PM_SIGHANDLER_H */ /* vim: set noet: */ diff --git a/src/pacman/util.h b/src/pacman/util.h index f5e37c81..74ce4cb2 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -17,8 +17,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifndef _PM_UTIL_H -#define _PM_UTIL_H +#ifndef PM_UTIL_H +#define PM_UTIL_H #include #include @@ -82,6 +82,6 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list int pm_sprintf(char **string, alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,3,4))); int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); -#endif /* _PM_UTIL_H */ +#endif /* PM_UTIL_H */ /* vim: set noet: */ -- cgit v1.2.3-70-g09d2