Commit f11ec7ba authored by Anders Blomdell's avatar Anders Blomdell
Browse files

Guard macro unification/cleanup

parent 24cc29e9
/* /*
labcomm.h -- user interface for handling encoding and decoding of labcomm2006.h -- user interface for handling encoding and decoding of
labcomm samples. labcomm samples.
Copyright 2006-2013 Anders Blomdell <anders.blomdell@control.lth.se> Copyright 2006-2013 Anders Blomdell <anders.blomdell@control.lth.se>
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _LABCOMM_H_ #ifndef __LABCOMM2006_H__
#define _LABCOMM_H_ #define __LABCOMM2006_H__
#include <stdarg.h> #include <stdarg.h>
......
...@@ -18,7 +18,11 @@ ...@@ -18,7 +18,11 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __LABCOMM2006_DEFAULT_ERROR_HANDLER_H__
#define __LABCOMM2006_DEFAULT_ERROR_HANDLER_H__
#include "labcomm2006.h" #include "labcomm2006.h"
extern struct labcomm2006_error_handler *labcomm2006_default_error_handler; extern struct labcomm2006_error_handler *labcomm2006_default_error_handler;
#endif
...@@ -18,9 +18,12 @@ ...@@ -18,9 +18,12 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __LABCOMM2006_DEFAULT_MEMORY_H__
#define __LABCOMM2006_DEFAULT_MEMORY_H__
#include <stdlib.h> #include <stdlib.h>
#include "labcomm2006.h" #include "labcomm2006.h"
extern struct labcomm2006_memory *labcomm2006_default_memory; extern struct labcomm2006_memory *labcomm2006_default_memory;
#endif
...@@ -18,7 +18,11 @@ ...@@ -18,7 +18,11 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __LABCOMM2006_DEFAULT_SCHEDULER_H__
#define __LABCOMM2006_DEFAULT_SCHEDULER_H__
#include "labcomm2006.h" #include "labcomm2006.h"
extern struct labcomm2006_scheduler *labcomm2006_default_scheduler; extern struct labcomm2006_scheduler *labcomm2006_default_scheduler;
#endif
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _LABCOMM_DYNAMIC_BUFFER_READER_WRITER_H_ #ifndef __LABCOMM2006_DYNAMIC_BUFFER_READER_WRITER_H__
#define _LABCOMM_DYNAMIC_BUFFER_READER_WRITER_H_ #define __LABCOMM2006_DYNAMIC_BUFFER_READER_WRITER_H__
#include "labcomm2006.h" #include "labcomm2006.h"
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __LABCOMM_ERROR_H__ #ifndef __LABCOMM2006_ERROR_H__
#define __LABCOMM_ERROR_H__ #define __LABCOMM2006_ERROR_H__
enum labcomm2006_error { enum labcomm2006_error {
#define LABCOMM_ERROR(name, description) name , #define LABCOMM_ERROR(name, description) name ,
......
/* /*
labcomm2006_fd_reader.c -- a reader for unix style file-descriptors labcomm2006_fd_reader.c -- a reader for unix style file-descriptors
...@@ -19,8 +20,8 @@ ...@@ -19,8 +20,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _LABCOMM_FD_READER_H_ #ifndef __LABCOMM2006_FD_READER_H__
#define _LABCOMM_FD_READER_H_ #define __LABCOMM2006_FD_READER_H__
#include "labcomm2006.h" #include "labcomm2006.h"
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _LABCOMM_FD_WRITER_H_ #ifndef __LABCOMM2006_FD_WRITER_H__
#define _LABCOMM_FD_WRITER_H_ #define __LABCOMM2006_FD_WRITER_H__
#include "labcomm2006.h" #include "labcomm2006.h"
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __LABCOMM_IOCTL_H__ #ifndef __LABCOMM2006_IOCTL_H__
#define __LABCOMM_IOCTL_H__ #define __LABCOMM2006_IOCTL_H__
#include "labcomm2006.h" #include "labcomm2006.h"
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _LABCOMM_PRIVATE_H_ #ifndef __LABCOMM2006_PRIVATE_H__
#define _LABCOMM_PRIVATE_H_ #define __LABCOMM2006_PRIVATE_H__
#ifdef LABCOMM_COMPAT #ifdef LABCOMM_COMPAT
#include LABCOMM_COMPAT #include LABCOMM_COMPAT
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _LABCOMM_PTHREAD_SCHEDULER_H_ #ifndef __LABCOMM2006_PTHREAD_SCHEDULER_H__
#define _LABCOMM_PTHREAD_SCHEDULER_H_ #define __LABCOMM2006_PTHREAD_SCHEDULER_H__
#include "labcomm2006.h" #include "labcomm2006.h"
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _LABCOMM_SCHEDULER_H_ #ifndef __LABCOMM2006_SCHEDULER_H__
#define _LABCOMM_SCHEDULER_H_ #define __LABCOMM2006_SCHEDULER_H__
#ifdef LABCOMM_COMPAT #ifdef LABCOMM_COMPAT
#include LABCOMM_COMPAT #include LABCOMM_COMPAT
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _LABCOMM_SCHEDULER_PRIVATE_H_ #ifndef __LABCOMM2006_SCHEDULER_PRIVATE_H__
#define _LABCOMM_SCHEDULER_PRIVATE_H_ #define __LABCOMM2006_SCHEDULER_PRIVATE_H__
#ifdef LABCOMM_COMPAT #ifdef LABCOMM_COMPAT
#include LABCOMM_COMPAT #include LABCOMM_COMPAT
......
#ifndef _LABCOMM2006_COMPAT_VXWORKS_H_ #ifndef __LABCOMM2006_COMPAT_VXWORKS_H__
#define _LABCOMM2006_COMPAT_VXWORKS_H_ #define __LABCOMM2006_COMPAT_VXWORKS_H__
#ifndef __VXWORKS__ #ifndef __VXWORKS__
#error "__VXWORKS__" not defined #error "__VXWORKS__" not defined
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _LABCOMM_H_ #ifndef __LABCOMM_H__
#define _LABCOMM_H_ #define __LABCOMM_H__
#include <stdarg.h> #include <stdarg.h>
......
...@@ -18,7 +18,11 @@ ...@@ -18,7 +18,11 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __LABCOMM_DEFAULT_ERROR_HANDLER_H__
#define __LABCOMM_DEFAULT_ERROR_HANDLER_H__
#include "labcomm.h" #include "labcomm.h"
extern struct labcomm_error_handler *labcomm_default_error_handler; extern struct labcomm_error_handler *labcomm_default_error_handler;
#endif
...@@ -18,9 +18,12 @@ ...@@ -18,9 +18,12 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __LABCOMM_DEFAULT_MEMORY_H__
#define __LABCOMM_DEFAULT_MEMORY_H__
#include <stdlib.h> #include <stdlib.h>
#include "labcomm.h" #include "labcomm.h"
extern struct labcomm_memory *labcomm_default_memory; extern struct labcomm_memory *labcomm_default_memory;
#endif
...@@ -18,7 +18,11 @@ ...@@ -18,7 +18,11 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __LABCOMM_DEFAULT_SCHEDULER_H__
#define __LABCOMM_DEFAULT_SCHEDULER_H__
#include "labcomm.h" #include "labcomm.h"
extern struct labcomm_scheduler *labcomm_default_scheduler; extern struct labcomm_scheduler *labcomm_default_scheduler;
#endif
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _LABCOMM_DYNAMIC_BUFFER_READER_WRITER_H_ #ifndef __LABCOMM_DYNAMIC_BUFFER_READER_WRITER_H__
#define _LABCOMM_DYNAMIC_BUFFER_READER_WRITER_H_ #define __LABCOMM_DYNAMIC_BUFFER_READER_WRITER_H__
#include "labcomm.h" #include "labcomm.h"
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __LABCOMM_ERROR_H__ #ifndef __LABCOMM_ERROR_H___
#define __LABCOMM_ERROR_H__ #define __LABCOMM_ERROR_H___
enum labcomm_error { enum labcomm_error {
#define LABCOMM_ERROR(name, description) name , #define LABCOMM_ERROR(name, description) name ,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment