From owner-svn-src-all@FreeBSD.ORG Fri Jul 15 00:36:48 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68A80106566C; Fri, 15 Jul 2011 00:36:48 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4E6828FC0A; Fri, 15 Jul 2011 00:36:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6F0amIg052806; Fri, 15 Jul 2011 00:36:48 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6F0am6j052797; Fri, 15 Jul 2011 00:36:48 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201107150036.p6F0am6j052797@svn.freebsd.org> From: Ed Maste Date: Fri, 15 Jul 2011 00:36:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224046 - head/sys/dev/aic7xxx/aicasm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2011 00:36:48 -0000 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 #include -#if linux +#if defined(__linux__) || defined(__GLIBC__) #include #else #include 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 -#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 #include #include - -#ifdef __linux__ -#include "../queue.h" -#else #include -#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 #include #include - -#ifdef __linux__ -#include "../queue.h" -#else #include -#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 #include #include -#ifdef __linux__ -#include "../queue.h" -#else #include -#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 #include #include -#ifdef __linux__ -#include "../queue.h" -#else #include -#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 - -#ifdef __linux__ -#include "aicdb.h" -#else +#include +#ifdef BSD #include +#else +#include #endif #include #include 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 -#endif typedef enum { UNINITIALIZED,