Module: xenomai-forge
Branch: master
Commit: 0f3a898d27e4b06bf8456881c15f2179e3c83ea6
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=0f3a898d27e4b06bf8456881c15f2179e3c83ea6

Author: Philippe Gerum <r...@xenomai.org>
Date:   Sun Jan 29 12:38:42 2012 +0100

include/cobalt: fix inclusion guards

---

 include/cobalt/errno.h      |    6 +++---
 include/cobalt/fcntl.h      |    6 +++---
 include/cobalt/mqueue.h     |    6 +++---
 include/cobalt/posix.h      |    6 +++---
 include/cobalt/pthread.h    |    6 +++---
 include/cobalt/sched.h      |    6 +++---
 include/cobalt/semaphore.h  |    6 +++---
 include/cobalt/signal.h     |    6 +++---
 include/cobalt/sys/ioctl.h  |    6 +++---
 include/cobalt/sys/select.h |   24 +++++++++++++++++++++---
 include/cobalt/sys/socket.h |    6 +++---
 include/cobalt/sys/time.h   |    6 +++---
 include/cobalt/time.h       |    6 +++---
 include/cobalt/unistd.h     |    6 +++---
 14 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/include/cobalt/errno.h b/include/cobalt/errno.h
index 2ad0fda..e47ea74 100644
--- a/include/cobalt/errno.h
+++ b/include/cobalt/errno.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _XENO_ERRNO_H
-#define _XENO_ERRNO_H
+#ifndef _COBALT_ERRNO_H
+#define _COBALT_ERRNO_H
 
 #ifdef __KERNEL__
 
@@ -40,4 +40,4 @@ int *xnthread_get_errno_location(struct xnthread *thread);
 
 #endif /* !__KERNEL__ */
 
-#endif /* _XENO_ERRNO_H */
+#endif /* !_COBALT_ERRNO_H */
diff --git a/include/cobalt/fcntl.h b/include/cobalt/fcntl.h
index 61c1194..aee04fb 100644
--- a/include/cobalt/fcntl.h
+++ b/include/cobalt/fcntl.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _XENO_POSIX_FCNTL_H
-#define _XENO_POSIX_FCNTL_H
+#ifndef _COBALT_FCNTL_H
+#define _COBALT_FCNTL_H
 
 #ifdef __KERNEL__
 
@@ -50,4 +50,4 @@ COBALT_DECL(int, open(const char *path, int oflag, ...));
 
 #endif /* !__KERNEL__ */
 
-#endif /* _XENO_POSIX_FCNTL_H */
+#endif /* !_COBALT_FCNTL_H */
diff --git a/include/cobalt/mqueue.h b/include/cobalt/mqueue.h
index ae03172..5bf9d5e 100644
--- a/include/cobalt/mqueue.h
+++ b/include/cobalt/mqueue.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _XENO_POSIX_MQUEUE_H
-#define _XENO_POSIX_MQUEUE_H
+#ifndef _COBALT_MQUEUE_H
+#define _COBALT_MQUEUE_H
 
 #ifdef __KERNEL__
 
@@ -106,4 +106,4 @@ COBALT_DECL(int, mq_notify(mqd_t q,
 
 #endif /* !(__KERNEL__ || !HAVE_MQUEUE_H) */
 
-#endif /* _XENO_POSIX_MQUEUE_H */
+#endif /* !_COBALT_MQUEUE_H */
diff --git a/include/cobalt/posix.h b/include/cobalt/posix.h
index ad9b41e..92fa426 100644
--- a/include/cobalt/posix.h
+++ b/include/cobalt/posix.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _XENO_SKIN_POSIX_H
-#define _XENO_SKIN_POSIX_H
+#ifndef _COBALT_POSIX_H
+#define _COBALT_POSIX_H
 
 #define COBALT_SKIN_MAGIC           0x50534531
 
@@ -33,4 +33,4 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
-#endif /* !_XENO_SKIN_POSIX_H */
+#endif /* !_COBALT_POSIX_H */
diff --git a/include/cobalt/pthread.h b/include/cobalt/pthread.h
index 6531980..58b7ba0 100644
--- a/include/cobalt/pthread.h
+++ b/include/cobalt/pthread.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _XENO_POSIX_PTHREAD_H
-#define _XENO_POSIX_PTHREAD_H
+#ifndef _COBALT_PTHREAD_H
+#define _COBALT_PTHREAD_H
 
 #ifdef __KERNEL__
 
@@ -388,4 +388,4 @@ int pthread_attr_setscope_ex(pthread_attr_ex_t *attr_ex,
 
 #endif /* !__KERNEL__ */
 
-#endif /* _XENO_POSIX_PTHREAD_H */
+#endif /* !_COBALT_PTHREAD_H */
diff --git a/include/cobalt/sched.h b/include/cobalt/sched.h
index e21f8d9..eeb114f 100644
--- a/include/cobalt/sched.h
+++ b/include/cobalt/sched.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _XENO_POSIX_SCHED_H
-#define _XENO_POSIX_SCHED_H
+#ifndef _COBALT_SCHED_H
+#define _COBALT_SCHED_H
 
 #ifdef __KERNEL__
 
@@ -75,4 +75,4 @@ struct sched_param_ex {
 
 #endif /* __sched_extensions_defined */
 
-#endif /* SCHED_H */
+#endif /* !_COBALT_SCHED_H */
diff --git a/include/cobalt/semaphore.h b/include/cobalt/semaphore.h
index f4423f0..1530b08 100644
--- a/include/cobalt/semaphore.h
+++ b/include/cobalt/semaphore.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _XENO_POSIX_SEMAPHORE_H
-#define _XENO_POSIX_SEMAPHORE_H
+#ifndef _COBALT_SEMAPHORE_H
+#define _COBALT_SEMAPHORE_H
 
 #ifdef __KERNEL__
 
@@ -104,4 +104,4 @@ union __xeno_sem {
 #define SEM_WARNDEL  0x10
 #define SEM_RAWCLOCK 0x20
 
-#endif /* _XENO_POSIX_SEMAPHORE_H */
+#endif /* !_COBALT_SEMAPHORE_H */
diff --git a/include/cobalt/signal.h b/include/cobalt/signal.h
index 6b20370..69e5b55 100644
--- a/include/cobalt/signal.h
+++ b/include/cobalt/signal.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _XENO_POSIX_SIGNAL_H
-#define _XENO_POSIX_SIGNAL_H
+#ifndef _COBALT_SIGNAL_H
+#define _COBALT_SIGNAL_H
 
 #ifdef __KERNEL__
 
@@ -125,4 +125,4 @@ int pthread_sigqueue_np (struct cobalt_thread *thread, int 
sig, union sigval val
 #define SIGKICK (SIGRTMAX + 4)
 #define SIGDEMT (SIGRTMAX + 5)
 
-#endif /* _XENO_POSIX_SIGNAL_H */
+#endif /* !_COBALT_SIGNAL_H */
diff --git a/include/cobalt/sys/ioctl.h b/include/cobalt/sys/ioctl.h
index dab2a91..416e97f 100644
--- a/include/cobalt/sys/ioctl.h
+++ b/include/cobalt/sys/ioctl.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _XENO_POSIX_SYS_IOCTL_H
-#define _XENO_POSIX_SYS_IOCTL_H
+#ifndef _COBALT_SYS_IOCTL_H
+#define _COBALT_SYS_IOCTL_H
 
 #ifndef __KERNEL__
 
@@ -36,4 +36,4 @@ COBALT_DECL(int, ioctl(int fildes, unsigned long int request, 
...));
 
 #endif /* !__KERNEL__ */
 
-#endif /* _XENO_POSIX_SYS_IOCTL_H */
+#endif /* !_COBALT_SYS_IOCTL_H */
diff --git a/include/cobalt/sys/select.h b/include/cobalt/sys/select.h
index 598e2c6..07bcdba 100644
--- a/include/cobalt/sys/select.h
+++ b/include/cobalt/sys/select.h
@@ -1,5 +1,23 @@
-#ifndef _XENO_POSIX_SELECT_H
-#define _XENO_POSIX_SELECT_H
+/*
+ * Copyright (C) 2010 Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _COBALT_SELECT_H
+#define _COBALT_SELECT_H
 
 #ifndef __KERNEL__
 
@@ -20,4 +38,4 @@ COBALT_DECL(int, select(int __nfds, fd_set *__restrict 
__readfds,
 
 #endif /* !__KERNEL__ */
 
-#endif /* _XENO_POSIX_SELECT_H */
+#endif /* !_COBALT_SELECT_H */
diff --git a/include/cobalt/sys/socket.h b/include/cobalt/sys/socket.h
index 103f66a..8ec56ad 100644
--- a/include/cobalt/sys/socket.h
+++ b/include/cobalt/sys/socket.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _XENO_POSIX_SOCKET_H
-#define _XENO_POSIX_SOCKET_H
+#ifndef _COBALT_SOCKET_H
+#define _COBALT_SOCKET_H
 
 #ifndef __KERNEL__
 
@@ -80,4 +80,4 @@ COBALT_DECL(int, shutdown(int fd, int how));
 
 #endif /* !__KERNEL__ */
 
-#endif /* _XENO_POSIX_SOCKET_H */
+#endif /* !_COBALT_SOCKET_H */
diff --git a/include/cobalt/sys/time.h b/include/cobalt/sys/time.h
index dfb325c..a9b08fd 100644
--- a/include/cobalt/sys/time.h
+++ b/include/cobalt/sys/time.h
@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#ifndef _XENO_POSIX_SYS_TIME_H
-#define _XENO_POSIX_SYS_TIME_H
+#ifndef _COBALT_SYS_TIME_H
+#define _COBALT_SYS_TIME_H
 
 #ifndef __KERNEL__
 
@@ -38,4 +38,4 @@ COBALT_DECL(int, gettimeofday(struct timeval *tv,
 
 #endif /* !__KERNEL__ */
 
-#endif /* !_XENO_POSIX_SYS_TIME_H */
+#endif /* !_COBALT_SYS_TIME_H */
diff --git a/include/cobalt/time.h b/include/cobalt/time.h
index 30d477d..460b449 100644
--- a/include/cobalt/time.h
+++ b/include/cobalt/time.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _XENO_POSIX_TIME_H
-#define _XENO_POSIX_TIME_H
+#ifndef _COBALT_TIME_H
+#define _COBALT_TIME_H
 
 #ifdef __KERNEL__
 
@@ -103,4 +103,4 @@ COBALT_DECL(int, timer_getoverrun(timer_t timerid));
 
 #endif /* !__KERNEL__ */
 
-#endif /* _XENO_POSIX_TIME_H */
+#endif /* !_COBALT_TIME_H */
diff --git a/include/cobalt/unistd.h b/include/cobalt/unistd.h
index 7e1be94..ba12e6e 100644
--- a/include/cobalt/unistd.h
+++ b/include/cobalt/unistd.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _XENO_POSIX_UNISTD_H
-#define _XENO_POSIX_UNISTD_H
+#ifndef _COBALT_UNISTD_H
+#define _COBALT_UNISTD_H
 
 #ifdef __KERNEL__
 
@@ -44,4 +44,4 @@ COBALT_DECL(int, close(int fildes));
 
 #endif /* !__KERNEL__ */
 
-#endif /* _XENO_POSIX_UNISTD_H */
+#endif /* !_COBALT_UNISTD_H */


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git

Reply via email to