svn commit: r224046 - head/sys/dev/aic7xxx/aicasm

[Ed Maste]

Author: emaste
Date: Fri Jul 15 00:36:47 2011
New Revision: 224046
URL: http://svn.freebsd.org/changeset/base/224046

Log:
  Improve portability #defines for compiling aicasm on other systems.
  
  Submitted by:	Robert Millan  rmh debian.org
  Obtained from:	Debian GNU/kFreeBSD

Modified:
  head/sys/dev/aic7xxx/aicasm/aicasm.c
  head/sys/dev/aic7xxx/aicasm/aicasm.h
  head/sys/dev/aic7xxx/aicasm/aicasm_gram.y
  head/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
  head/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
  head/sys/dev/aic7xxx/aicasm/aicasm_scan.l
  head/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
  head/sys/dev/aic7xxx/aicasm/aicasm_symbol.h

Modified: head/sys/dev/aic7xxx/aicasm/aicasm.c
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm.c	Thu Jul 14 23:30:30 2011	(r224045)
+++ head/sys/dev/aic7xxx/aicasm/aicasm.c	Fri Jul 15 00:36:47 2011	(r224046)
@@ -53,7 +53,7 @@
 #include <sysexits.h>
 #include <unistd.h>
 
-#if linux
+#if defined(__linux__) || defined(__GLIBC__)
 #include <endian.h>
 #else
 #include <machine/endian.h>

Modified: head/sys/dev/aic7xxx/aicasm/aicasm.h
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm.h	Thu Jul 14 23:30:30 2011	(r224045)
+++ head/sys/dev/aic7xxx/aicasm/aicasm.h	Fri Jul 15 00:36:47 2011	(r224046)
@@ -42,11 +42,7 @@
  * $FreeBSD$
  */
 
-#ifdef __linux__
-#include "../queue.h"
-#else
 #include <sys/queue.h>
-#endif
 
 #ifndef TRUE
 #define TRUE 1

Modified: head/sys/dev/aic7xxx/aicasm/aicasm_gram.y
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm_gram.y	Thu Jul 14 23:30:30 2011	(r224045)
+++ head/sys/dev/aic7xxx/aicasm/aicasm_gram.y	Fri Jul 15 00:36:47 2011	(r224046)
@@ -51,12 +51,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
-
-#ifdef __linux__
-#include "../queue.h"
-#else
 #include <sys/queue.h>
-#endif
 
 #include "aicasm.h"
 #include "aicasm_symbol.h"

Modified: head/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y	Thu Jul 14 23:30:30 2011	(r224045)
+++ head/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y	Fri Jul 15 00:36:47 2011	(r224046)
@@ -51,12 +51,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
-
-#ifdef __linux__
-#include "../queue.h"
-#else
 #include <sys/queue.h>
-#endif
 
 #include "aicasm.h"
 #include "aicasm_symbol.h"

Modified: head/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l	Thu Jul 14 23:30:30 2011	(r224045)
+++ head/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l	Fri Jul 15 00:36:47 2011	(r224046)
@@ -51,11 +51,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sysexits.h>
-#ifdef __linux__
-#include "../queue.h"
-#else
 #include <sys/queue.h>
-#endif
 
 #include "aicasm.h"
 #include "aicasm_symbol.h"

Modified: head/sys/dev/aic7xxx/aicasm/aicasm_scan.l
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm_scan.l	Thu Jul 14 23:30:30 2011	(r224045)
+++ head/sys/dev/aic7xxx/aicasm/aicasm_scan.l	Fri Jul 15 00:36:47 2011	(r224046)
@@ -51,11 +51,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sysexits.h>
-#ifdef __linux__
-#include "../queue.h"
-#else
 #include <sys/queue.h>
-#endif
 
 #include "aicasm.h"
 #include "aicasm_symbol.h"

Modified: head/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm_symbol.c	Thu Jul 14 23:30:30 2011	(r224045)
+++ head/sys/dev/aic7xxx/aicasm/aicasm_symbol.c	Fri Jul 15 00:36:47 2011	(r224046)
@@ -43,11 +43,11 @@
  */
 
 #include <sys/types.h>
-
-#ifdef __linux__
-#include "aicdb.h"
-#else
+#include <sys/param.h>
+#ifdef BSD
 #include <db.h>
+#else
+#include <db_185.h>
 #endif
 #include <ctype.h>
 #include <fcntl.h>

Modified: head/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm_symbol.h	Thu Jul 14 23:30:30 2011	(r224045)
+++ head/sys/dev/aic7xxx/aicasm/aicasm_symbol.h	Fri Jul 15 00:36:47 2011	(r224046)
@@ -42,11 +42,7 @@
  * $FreeBSD$
  */
 
-#ifdef __linux__
-#include "../queue.h"
-#else
 #include <sys/queue.h>
-#endif
 
 typedef enum {
 	UNINITIALIZED,