use same ifndef/define format for all headers

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
S.Çağlar Onur 2014-05-08 23:51:07 -04:00 committed by Stéphane Graber
parent 29b0b04b32
commit f1a4a029f6
30 changed files with 68 additions and 54 deletions

View File

@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __LXC_AF_UNIX_H
#define __LXC_AF_UNIX_H
extern int lxc_abstract_unix_open(const char *path, int type, int flags);
extern int lxc_abstract_unix_close(int fd);
extern int lxc_abstract_unix_connect(const char *path);
@ -29,3 +32,4 @@ extern int lxc_abstract_unix_recv_fd(int fd, int *recvfd, void *data, size_t siz
extern int lxc_abstract_unix_send_credential(int fd, void *data, size_t size);
extern int lxc_abstract_unix_rcv_credential(int fd, void *data, size_t size);
#endif

View File

@ -21,8 +21,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __arguments_h
#define __arguments_h
#ifndef __LXC_ARGUMENTS_H
#define __LXC_ARGUMENTS_H
#include <getopt.h>
#include <stdint.h>

View File

@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _attach_h
#define _attach_h
#ifndef __LXC_ATTACH_H
#define __LXC_ATTACH_H
#include <sys/types.h>
#include <lxc/attach_options.h>

View File

@ -22,8 +22,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _LXC_ATTACH_OPTIONS_H
#define _LXC_ATTACH_OPTIONS_H
#ifndef __LXC_ATTACH_OPTIONS_H
#define __LXC_ATTACH_OPTIONS_H
#include <sys/types.h>

View File

@ -22,8 +22,8 @@
*/
#include "config.h"
#ifndef _caps_h
#define _caps_h
#ifndef __LXC_CAPS_H
#define __LXC_CAPS_H
#if HAVE_SYS_CAPABILITY_H
extern int lxc_caps_reset(void);

View File

@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __lxc_cgroup_h
#define __lxc_cgroup_h
#ifndef __LXC_CGROUP_H
#define __LXC_CGROUP_H
#include <stdbool.h>
#include <stddef.h>

View File

@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __commands_h
#define __commands_h
#ifndef __LXC_COMMANDS_H
#define __LXC_COMMANDS_H
#include "state.h"

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _conf_h
#define _conf_h
#ifndef __LXC_CONF_H
#define __LXC_CONF_H
#include "config.h"

View File

@ -21,12 +21,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __LXC_CONFILE_H
#define __LXC_CONFILE_H
#include <stdio.h>
#include <lxc/attach_options.h>
#ifndef _confile_h
#define _confile_h
struct lxc_conf;
struct lxc_list;

View File

@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __LXC_CONSOLE_H
#define __LXC_CONSOLE_H
struct lxc_epoll_descr;
struct lxc_container;
@ -37,3 +40,5 @@ extern int lxc_console(struct lxc_container *c, int ttynum,
extern int lxc_console_getfd(struct lxc_container *c, int *ttynum,
int *masterfd);
extern int lxc_console_set_stdfds(struct lxc_handler *);
#endif

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __lxc_error_h
#define __lxc_error_h
#ifndef __LXC_ERROR_H
#define __LXC_ERROR_H
extern int lxc_error_set_and_log(int pid, int status);

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __genl_h
#define __genl_h
#ifndef __LXC_GENL_H
#define __LXC_GENL_H
/*
* Use this as a good size to allocate generic netlink messages

View File

@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _list_h
#define _list_h
#ifndef __LXC_LIST_H
#define __LXC_LIST_H
struct lxc_list {
void *elem;

View File

@ -21,8 +21,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _log_h
#define _log_h
#ifndef __LXC_LOG_H
#define __LXC_LOG_H
#include "config.h"

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __lxc_h
#define __lxc_h
#ifndef __LXC_LXC_H
#define __LXC_LXC_H
#ifdef __cplusplus
extern "C" {

View File

@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __LXCLOCK_H
#define __LXCLOCK_H
#ifndef __LXC_LXCLOCK_H
#define __LXC_LXCLOCK_H
#include <fcntl.h> /* For O_* constants */
#include <sys/stat.h> /* For mode constants */

View File

@ -21,7 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _lxc_seccomp_h
#ifndef __LXC_LXCSECCOMP_H
#define __LXC_LXCSECCOMP_H
#include "conf.h"

View File

@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __LXC_LXCUTMP_H
#define __LXC_LXCUTMP_H
#include "config.h"
struct lxc_handler;
@ -28,3 +31,4 @@ struct lxc_epoll_descr;
int lxc_utmp_mainloop_add(struct lxc_epoll_descr *descr,
struct lxc_handler *handler);
#endif

View File

@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _mainloop_h
#define _mainloop_h
#ifndef __LXC_MAINLOOP_H
#define __LXC_MAINLOOP_H
#include <stdint.h>
#include "list.h"

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __monitor_h
#define __monitor_h
#ifndef __LXC_MONITOR_H
#define __LXC_MONITOR_H
#include <limits.h>
#include <sys/param.h>

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __namespace_h
#define __namespace_h
#ifndef __LXC_NAMESPACE_H
#define __LXC_NAMESPACE_H
#include <sys/syscall.h>
#include <sched.h>

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _network_h
#define _network_h
#ifndef __LXC_NETWORK_H
#define __LXC_NETWORK_H
/*
* Convert a string mac address to a socket structure

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __nl_h
#define __nl_h
#ifndef __LXC_NL_H
#define __LXC_NL_H
/*
* Use this as a good size to allocate generic netlink messages

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __parse_h
#define __parse_h
#ifndef __LXC_PARSE_H
#define __LXC_PARSE_H
typedef int (*lxc_dir_cb)(const char *name, const char *directory,
const char *file, void *data);

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __genl_h
#define __genl_h
#ifndef __LXC_RTNL_H
#define __LXC_RTNL_H
/*
* Use this as a good size to allocate route netlink messages

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __lxc_state_h
#define __lxc_state_h
#ifndef __LXC_START_H
#define __LXC_START_H
#include <signal.h>
#include <sys/param.h>

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _state_h
#define _state_h
#ifndef __LXC_STATE_H
#define __LXC_STATE_H
typedef enum {
STOPPED, STARTING, RUNNING, STOPPING,

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __lxc_sync_h
#define __lxc_sync_h
#ifndef __LXC_SYNC_H
#define __LXC_SYNC_H
struct lxc_handler;

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _utils_h
#define _utils_h
#ifndef __LXC_UTILS_H
#define __LXC_UTILS_H
#include <errno.h>
#include <stdarg.h>

View File

@ -20,8 +20,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _VERSION_H
#define _VERSION_H
#ifndef __LXC_VERSION_H
#define __LXC_VERSION_H
#define LXC_VERSION_MAJOR @LXC_VERSION_MAJOR@
#define LXC_VERSION_MINOR @LXC_VERSION_MINOR@