| Message ID | 1416595306-55095-1-git-send-email-mike.holmes@linaro.org |
|---|---|
| State | Accepted |
| Commit | 519d9ec95bff2dd90cf2da9e6598f2adcc267e2a |
| Headers | show |
Merged! Maxim. On 11/21/2014 09:41 PM, Mike Holmes wrote: > Signed-off-by: Mike Holmes <mike.holmes@linaro.org> > --- > platform/linux-generic/include/api/odp_version.h | 2 +- > platform/linux-generic/odp_impl.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/platform/linux-generic/include/api/odp_version.h b/platform/linux-generic/include/api/odp_version.h > index 805ddba..43ddf89 100644 > --- a/platform/linux-generic/include/api/odp_version.h > +++ b/platform/linux-generic/include/api/odp_version.h > @@ -78,7 +78,7 @@ static inline const char *odp_version_api_str(void) > * > * @return null terminated implementation specific version identifier string > */ > -inline const char *odp_version_impl_str(void); > +const char *odp_version_impl_str(void); > /** > * @} > */ > diff --git a/platform/linux-generic/odp_impl.c b/platform/linux-generic/odp_impl.c > index c58cc09..3453ddb 100644 > --- a/platform/linux-generic/odp_impl.c > +++ b/platform/linux-generic/odp_impl.c > @@ -23,7 +23,7 @@ extern "C" { > #define ODP_VERSION_IMPL 0 > #define ODP_VERSION_IMPL_STR ODP_VERSION_TO_STR(ODP_VERSION_IMPL) > > -inline const char *odp_version_impl_str(void) > +const char *odp_version_impl_str(void) > { > return ODP_VERSION_IMPL_STR; > }
diff --git a/platform/linux-generic/include/api/odp_version.h b/platform/linux-generic/include/api/odp_version.h index 805ddba..43ddf89 100644 --- a/platform/linux-generic/include/api/odp_version.h +++ b/platform/linux-generic/include/api/odp_version.h @@ -78,7 +78,7 @@ static inline const char *odp_version_api_str(void) * * @return null terminated implementation specific version identifier string */ -inline const char *odp_version_impl_str(void); +const char *odp_version_impl_str(void); /** * @} */ diff --git a/platform/linux-generic/odp_impl.c b/platform/linux-generic/odp_impl.c index c58cc09..3453ddb 100644 --- a/platform/linux-generic/odp_impl.c +++ b/platform/linux-generic/odp_impl.c @@ -23,7 +23,7 @@ extern "C" { #define ODP_VERSION_IMPL 0 #define ODP_VERSION_IMPL_STR ODP_VERSION_TO_STR(ODP_VERSION_IMPL) -inline const char *odp_version_impl_str(void) +const char *odp_version_impl_str(void) { return ODP_VERSION_IMPL_STR; }
Signed-off-by: Mike Holmes <mike.holmes@linaro.org> --- platform/linux-generic/include/api/odp_version.h | 2 +- platform/linux-generic/odp_impl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)