Some definitions clashed with FreeBSD global name space. Use tgt spcific names Signed-off-by: Boaz Harrosh <bharrosh at panasas.com> --- usr/list.h | 6 +++--- usr/log.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/usr/list.h b/usr/list.h index 4d76057..a1b12ca 100644 --- a/usr/list.h +++ b/usr/list.h @@ -1,5 +1,5 @@ -#ifndef __LIST_H__ -#define __LIST_H__ +#ifndef __TGT_LIST_H__ +#define __TGT_LIST_H__ /* taken from linux kernel */ @@ -92,4 +92,4 @@ static inline void list_del_init(struct list_head *entry) INIT_LIST_HEAD(entry); } -#endif +#endif /*__TGT_LIST_H__*/ diff --git a/usr/log.h b/usr/log.h index b84f6d6..c07110d 100644 --- a/usr/log.h +++ b/usr/log.h @@ -28,7 +28,7 @@ #include <sys/sem.h> -union semun { +union tgt_semun { int val; struct semid_ds *buf; unsigned short int *array; @@ -56,7 +56,7 @@ struct logarea { void *end; char *buff; int semid; - union semun semarg; + union tgt_semun semarg; }; extern int log_init (char * progname, int size, int daemon, int debug); -- 1.6.0.6 -- To unsubscribe from this list: send the line "unsubscribe stgt" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html |