mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Anders Gustafsson <andersg@0x63.nu>
To: linux-kernel@vger.kernel.org
Cc: irda-users@lists.sourceforge.net, jt@bougret.hpl.hp.com,
	torvalds@transmeta.com
Subject: [PATCH] make irtty.c compile again
Date: Thu, 7 Mar 2002 22:15:27 +0100	[thread overview]
Message-ID: <20020307211527.GA7597@h55p111.delphi.afb.lu.se> (raw)

Hi,

irtty.c includes irqueue.h which includes linux/cache.h (via
asm/processor.h <- asm/thread_info.h <- linux/thread_info.h <-
linux/spinlock.h)

both irqueue.h and cache.h defines a ALIGN (for different
purposes). 

This patch renames ALIGN in irqueue.h to IRDA_ALIGN.

Guess i'll go grepping for more places ALIGN might be defined.

-- 

//anders/g

--- linux-2.5.6-pre3/include/net/irda/irda.h	Thu Mar  7 19:13:01 2002
+++ linux-2.5.6-pre3-mekk/include/net/irda/irda.h	Thu Mar  7 21:24:18 2002
@@ -54,8 +54,8 @@
 #define IRDA_MIN(a, b) (((a) < (b)) ? (a) : (b))
 #endif
 
-#ifndef ALIGN
-#  define ALIGN __attribute__((aligned))
+#ifndef IRDA_ALIGN
+#  define IRDA_ALIGN __attribute__((aligned))
 #endif
 #ifndef PACK
 #  define PACK __attribute__((packed))
diff -ru linux-2.5.6-pre3/include/net/irda/irqueue.h linux-2.5.6-pre3-mekk/include/net/irda/irqueue.h
--- linux-2.5.6-pre3/include/net/irda/irqueue.h	Thu Mar  7 19:39:58 2002
+++ linux-2.5.6-pre3-mekk/include/net/irda/irqueue.h	Thu Mar  7 21:24:18 2002
@@ -49,8 +49,8 @@
 #define HASHBIN_SIZE   8
 #define HASHBIN_MASK   0x7
 
-#ifndef ALIGN 
-#define ALIGN __attribute__((aligned))
+#ifndef IRDA_ALIGN 
+#define IRDA_ALIGN __attribute__((aligned))
 #endif
 
 #define Q_NULL { NULL, NULL, "", 0 }
@@ -75,8 +75,8 @@
 	__u32      magic;
 	int        hb_type;
 	int        hb_size;
-	spinlock_t hb_mutex[HASHBIN_SIZE] ALIGN;
-	irda_queue_t   *hb_queue[HASHBIN_SIZE] ALIGN;
+	spinlock_t hb_mutex[HASHBIN_SIZE] IRDA_ALIGN;
+	irda_queue_t   *hb_queue[HASHBIN_SIZE] IRDA_ALIGN;
 
 	irda_queue_t* hb_current;
 } hashbin_t;

             reply	other threads:[~2002-03-07 22:38 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2002-03-07 21:15 Anders Gustafsson [this message]
2002-03-07 23:28 ` Jean Tourrilhes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20020307211527.GA7597@h55p111.delphi.afb.lu.se \
    --to=andersg@0x63.nu \
    --cc=irda-users@lists.sourceforge.net \
    --cc=jt@bougret.hpl.hp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@transmeta.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®