diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2012-07-05 04:23:34 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2012-07-05 04:23:34 +0000 |
| commit | ab648330833e96932900cae995106a021d452b6c (patch) | |
| tree | dde7efbcd1f92589d8dda26aa0ec503d6ea55040 /sys | |
| parent | 9c8736b8428312ae1a6549e8bbc17016d0ee7cc8 (diff) | |
Concatenating strings doesn't require __CONCAT() (and must not in standard C)
ok miod@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mvme68k/include/prom.h | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/stand/libbug/prom.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/mvme68k/include/prom.h b/sys/arch/mvme68k/include/prom.h index 5178f43ffd8..efdc324a244 100644 --- a/sys/arch/mvme68k/include/prom.h +++ b/sys/arch/mvme68k/include/prom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: prom.h,v 1.11 2003/06/02 05:09:14 deraadt Exp $ */ +/* $OpenBSD: prom.h,v 1.12 2012/07/05 04:23:33 guenther Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -152,7 +152,7 @@ struct mvmeprom_args { #endif #define MVMEPROM_CALL(x) \ - __asm__ __volatile__ (__CONCAT("trap #15; .short ", __STRING(x)) ) + __asm__ __volatile__ ("trap #15; .short " __STRING(x)) #define MVMEPROM_NOARG() \ __asm__ __volatile__ ("clrl sp@-") #define MVMEPROM_ARG1(arg) \ diff --git a/sys/arch/mvme88k/stand/libbug/prom.h b/sys/arch/mvme88k/stand/libbug/prom.h index 03b562f588c..ae9e63a8a43 100644 --- a/sys/arch/mvme88k/stand/libbug/prom.h +++ b/sys/arch/mvme88k/stand/libbug/prom.h @@ -1,5 +1,5 @@ -/* $OpenBSD: prom.h,v 1.3 2003/09/07 21:35:35 miod Exp $ */ +/* $OpenBSD: prom.h,v 1.4 2012/07/05 04:23:33 guenther Exp $ */ #define MVMEPROM_CALL(x) \ - __asm__ __volatile__ (__CONCAT("or r9,r0,", __STRING(x))); \ + __asm__ __volatile__ ("or r9,r0," __STRING(x)); \ __asm__ __volatile__ ("tb0 0,r0,496") |