From 606d73c3492301e78e7ac85d3391a7836097b972 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 24 Mar 2010 15:51:55 +0100 Subject: [PATCH] include: refuse inclusion of seperate header files Later on it might make sense to move around function definitions between header files. Hence make sure that nobody includes any header file directly except the main one. Signed-off-by: Lennart Poettering Reviewed-By: Jan Safranek Acked-by: Dhaval Giani Signed-off-by: Dhaval Giani --- include/libcgroup.h | 4 ++++ include/libcgroup/config.h | 4 ++++ include/libcgroup/error.h | 4 ++++ include/libcgroup/groups.h | 4 ++++ include/libcgroup/init.h | 4 ++++ include/libcgroup/iterators.h | 4 ++++ include/libcgroup/tasks.h | 6 ++++-- 7 files changed, 28 insertions(+), 2 deletions(-) diff --git a/include/libcgroup.h b/include/libcgroup.h index 27812c55..e53a00bd 100644 --- a/include/libcgroup.h +++ b/include/libcgroup.h @@ -16,6 +16,8 @@ #ifndef _LIBCGROUP_H #define _LIBCGROUP_H +#define _LIBCGROUP_H_INSIDE + #include #include #include @@ -23,4 +25,6 @@ #include #include +#undef _LIBCGROUP_H_INSIDE + #endif /* _LIBCGROUP_H */ diff --git a/include/libcgroup/config.h b/include/libcgroup/config.h index 68029b8a..eb5fe8cb 100644 --- a/include/libcgroup/config.h +++ b/include/libcgroup/config.h @@ -1,6 +1,10 @@ #ifndef _LIBCGROUP_CONFIG_H #define _LIBCGROUP_CONFIG_H +#ifndef _LIBCGROUP_H_INSIDE +#error "Only should be included directly." +#endif + #include __BEGIN_DECLS diff --git a/include/libcgroup/error.h b/include/libcgroup/error.h index 4d756ff0..9a463b9e 100644 --- a/include/libcgroup/error.h +++ b/include/libcgroup/error.h @@ -1,6 +1,10 @@ #ifndef _LIBCGROUP_ERROR_H #define _LIBCGROUP_ERROR_H +#ifndef _LIBCGROUP_H_INSIDE +#error "Only should be included directly." +#endif + #include __BEGIN_DECLS diff --git a/include/libcgroup/groups.h b/include/libcgroup/groups.h index ba010118..2d123c20 100644 --- a/include/libcgroup/groups.h +++ b/include/libcgroup/groups.h @@ -1,6 +1,10 @@ #ifndef _LIBCGROUP_GROUPS_H #define _LIBCGROUP_GROUPS_H +#ifndef _LIBCGROUP_H_INSIDE +#error "Only should be included directly." +#endif + #include #include #include diff --git a/include/libcgroup/init.h b/include/libcgroup/init.h index 0e8f0f64..b38eb615 100644 --- a/include/libcgroup/init.h +++ b/include/libcgroup/init.h @@ -1,6 +1,10 @@ #ifndef _LIBCGROUP_INIT_H #define _LIBCGROUP_INIT_H +#ifndef _LIBCGROUP_H_INSIDE +#error "Only should be included directly." +#endif + #include __BEGIN_DECLS diff --git a/include/libcgroup/iterators.h b/include/libcgroup/iterators.h index c724abf8..3e9f9f72 100644 --- a/include/libcgroup/iterators.h +++ b/include/libcgroup/iterators.h @@ -1,6 +1,10 @@ #ifndef _LIBCGROUP_ITERATORS_H #define _LIBCGROUP_ITERATORS_H +#ifndef _LIBCGROUP_H_INSIDE +#error "Only should be included directly." +#endif + #include #include #include diff --git a/include/libcgroup/tasks.h b/include/libcgroup/tasks.h index 0bd4fb11..665f993d 100644 --- a/include/libcgroup/tasks.h +++ b/include/libcgroup/tasks.h @@ -1,6 +1,10 @@ #ifndef _LIBCGROUP_TASKS_H #define _LIBCGROUP_TASKS_H +#ifndef _LIBCGROUP_H_INSIDE +#error "Only should be included directly." +#endif + #include #include @@ -122,5 +126,3 @@ int cgroup_register_unchanged_process(pid_t pid, int flags); __END_DECLS #endif /* _LIBCGROUP_TASKS_H */ - - -- 2.47.2