diff options
| author | Aki Niemi <aki.niemi@nokia.com> | 2010-04-21 10:47:16 +0300 |
|---|---|---|
| committer | Aki Niemi <aki.niemi@nokia.com> | 2010-04-21 10:48:29 +0300 |
| commit | 22103491a4171a55a2593bb1b727b086c13df7c6 (patch) | |
| tree | f96b7673ab33732c62137b495bd3723d52a624bd /gisi/modem.h | |
| parent | 3dc106c627f858317df5d15ed019673cd8c83193 (diff) | |
| download | ofono-22103491a4171a55a2593bb1b727b086c13df7c6.tar.bz2 | |
gisi: move g_isi_modem_by_name to separate file
This fixes build warnings that resulted from conflicts between
linux/if.h and net/if.h.
Diffstat (limited to 'gisi/modem.h')
| -rw-r--r-- | gisi/modem.h | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/gisi/modem.h b/gisi/modem.h index 7c314e4e..1a36288f 100644 --- a/gisi/modem.h +++ b/gisi/modem.h @@ -1,5 +1,7 @@ -/** - * Copyright (C) 2009 Nokia Corporation. All rights reserved. +/* + * This file is part of oFono - Open Source Telephony + * + * Copyright (C) 2010 Nokia Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,11 +17,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA */ -#ifndef GISI_MODEM_H -#define GISI_MODEM_H + +#ifndef __GISI_MODEM_H +#define __GISI_MODEM_H #include <stdint.h> +#ifdef __cplusplus +extern "C" { +#endif + +typedef void (*GIsiDebugFunc) (const void *restrict data, size_t len, + void *opaque); + typedef struct _GIsiModem GIsiModem; static inline unsigned g_isi_modem_index(GIsiModem *m) @@ -27,9 +37,10 @@ static inline unsigned g_isi_modem_index(GIsiModem *m) return (uintptr_t)m; } -GIsiModem *g_isi_modem_by_name(char const *name); - -typedef void (*GIsiDebugFunc) (const void *restrict data, size_t len, - void *opaque); +GIsiModem *g_isi_modem_by_name(const char *name); +#ifdef __cplusplus +} #endif + +#endif /* __GISI_MODEM_H */ |