1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REORG: include: move the base files from common/ to haproxy/

Browse Source 
The files currently covered by api-t.h and api.h (compat, compiler,
defaults, initcall) are now located inside haproxy/.
This commit is contained in:
Willy Tarreau 2020-05-27 14:38:20 +02:00
parent b9082a93e5
commit fd4bffe7c0
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/haproxy/api-t.h
View File

@ -32,8 +32,8 @@
#include <inttypes.h> #include <inttypes.h>
#include <stddef.h> #include <stddef.h>
#include <common/compat.h> #include <haproxy/compat.h>
#include <common/compiler.h> #include <haproxy/compiler.h>
#include <common/defaults.h> #include <haproxy/defaults.h>
#endif /* _HAPROXY_TYPES_H */ #endif /* _HAPROXY_TYPES_H */

2
include/haproxy/api.h
View File

@ -30,7 +30,7 @@
#ifndef _HAPROXY_BASE_H #ifndef _HAPROXY_BASE_H
#define _HAPROXY_BASE_H #define _HAPROXY_BASE_H
#include <common/initcall.h> #include <haproxy/initcall.h>
#include <haproxy/api-t.h> #include <haproxy/api-t.h>
#endif #endif

10
include/common/compat.h → include/haproxy/compat.h
View File

@ -1,8 +1,8 @@
/* /*
* include/common/compat.h * include/haproxy/compat.h
* Operating system compatibility interface. * Operating system compatibility interface.
* *
* Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _COMMON_COMPAT_H #ifndef _HAPROXY_COMPAT_H
#define _COMMON_COMPAT_H #define _HAPROXY_COMPAT_H
#include <limits.h> #include <limits.h>
#include <signal.h> #include <signal.h>
@ -235,7 +235,7 @@ typedef struct { } empty_t;
#endif #endif
#endif #endif
#endif /* _COMMON_COMPAT_H */ #endif /* _HAPROXY_COMPAT_H */
/* /*
* Local variables: * Local variables:

10
include/common/compiler.h → include/haproxy/compiler.h
View File

@ -1,8 +1,8 @@
/* /*
* include/common/compiler.h * include/haproxy/compiler.h
* This files contains some compiler-specific settings. * This files contains some compiler-specific settings.
* *
* Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _COMMON_COMPILER_H #ifndef _HAPROXY_COMPILER_H
#define _COMMON_COMPILER_H #define _HAPROXY_COMPILER_H
/* /*
@ -200,4 +200,4 @@
#endif #endif
#endif #endif
#endif /* _COMMON_COMPILER_H */ #endif /* _HAPROXY_COMPILER_H */

10
include/common/defaults.h → include/haproxy/defaults.h
View File

@ -1,8 +1,8 @@
/* /*
* include/common/defaults.h * include/haproxy/defaults.h
* Miscellaneous default values. * Miscellaneous default values.
* *
* Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _COMMON_DEFAULTS_H #ifndef _HAPROXY_DEFAULTS_H
#define _COMMON_DEFAULTS_H #define _HAPROXY_DEFAULTS_H
/* MAX_PROCS defines the highest limit for the global "nbproc" value. It /* MAX_PROCS defines the highest limit for the global "nbproc" value. It
* defaults to the number of bits in a long integer but may be lowered to save * defaults to the number of bits in a long integer but may be lowered to save
@ -347,4 +347,4 @@
#define DEFAULT_PAT_LRU_SIZE 10000 #define DEFAULT_PAT_LRU_SIZE 10000
#endif #endif
#endif /* _COMMON_DEFAULTS_H */ #endif /* _HAPROXY_DEFAULTS_H */

10
include/common/initcall.h → include/haproxy/initcall.h
View File

@ -1,9 +1,9 @@
/* /*
* include/common/initcall.h * include/haproxy/initcall.h
* *
* Initcall management. * Initcall management.
* *
* Copyright (C) 2018 Willy Tarreau - w@1wt.eu * Copyright (C) 2018-2020 Willy Tarreau - w@1wt.eu
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the * a copy of this software and associated documentation files (the
@ -26,8 +26,8 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifndef _COMMON_INIT_H #ifndef _HAPROXY_INITCALL_H
#define _COMMON_INIT_H #define _HAPROXY_INITCALL_H
/* List of known init stages. If others are added, please declare their /* List of known init stages. If others are added, please declare their
* section at the end of the file below. * section at the end of the file below.
@ -258,7 +258,7 @@ extern struct initcall *__initstg[STG_SIZE];
#endif // USE_OBSOLETE_LINKER #endif // USE_OBSOLETE_LINKER
#endif /* _COMMON_INIT_H */ #endif /* _HAPROXY_INITCALL_H */
/* /*
* Local variables: * Local variables: