summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2012-08-22 13:37:04 +0000
committerjsg <jsg@openbsd.org>2012-08-22 13:37:04 +0000
commitfd606df3f4193dbeb4c6020840f5c5f26e37d0d9 (patch)
treeee22962b2d5a945fabbb980b90d45bf0ce4edc97
parentsigpid should be of type pid_t (only visable with DEBUG). (diff)
downloadwireguard-openbsd-fd606df3f4193dbeb4c6020840f5c5f26e37d0d9.tar.xz
wireguard-openbsd-fd606df3f4193dbeb4c6020840f5c5f26e37d0d9.zip
use static inline instead of inline so this will be compatible with
compilers defaulting to c99 inline instead of the old gnu style. ok guenther@ miod@ deraadt@
-rw-r--r--sys/arch/arm/xscale/pxa2x0_mmc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/arm/xscale/pxa2x0_mmc.c b/sys/arch/arm/xscale/pxa2x0_mmc.c
index 6451c19677e..39b1a06791b 100644
--- a/sys/arch/arm/xscale/pxa2x0_mmc.c
+++ b/sys/arch/arm/xscale/pxa2x0_mmc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxa2x0_mmc.c,v 1.10 2011/04/07 15:30:15 miod Exp $ */
+/* $OpenBSD: pxa2x0_mmc.c,v 1.11 2012/08/22 13:37:04 jsg Exp $ */
/*
* Copyright (c) 2007 Uwe Stuehler <uwe@openbsd.org>
@@ -62,8 +62,8 @@ void pxammc_clock_stop(struct pxammc_softc *);
void pxammc_clock_start(struct pxammc_softc *);
int pxammc_card_intr(void *);
int pxammc_intr(void *);
-inline void pxammc_intr_cmd(struct pxammc_softc *);
-inline void pxammc_intr_data(struct pxammc_softc *);
+static inline void pxammc_intr_cmd(struct pxammc_softc *);
+static inline void pxammc_intr_data(struct pxammc_softc *);
void pxammc_intr_done(struct pxammc_softc *);
#define CSR_READ_1(sc, reg) \
@@ -562,7 +562,7 @@ end:
return 1;
}
-inline void
+static inline void
pxammc_intr_cmd(struct pxammc_softc *sc)
{
struct sdmmc_command *cmd = sc->sc_cmd;
@@ -633,7 +633,7 @@ pxammc_intr_cmd(struct pxammc_softc *sc)
pxammc_intr_done(sc);
}
-inline void
+static inline void
pxammc_intr_data(struct pxammc_softc *sc)
{
struct sdmmc_command *cmd = sc->sc_cmd;