projects / packages / libnl1.git / blame
| Commit | Line | Data |
|---|---|---|
| fe91a5dd AM |
1 | From 84fefcadcde5d6c343db7f5c1744f6b1f070bc71 Mon Sep 17 00:00:00 2001 |
| 2 | From: Peter Jones <pjones@redhat.com> | |
| 3 | Date: Thu, 14 May 2009 11:30:40 -0400 | |
| 4 | Subject: [PATCH] Remove "inline" keyword from nl_object_priv(). | |
| 5 | ||
| 6 | "extern inline foo();" in a header file generates a compiler warning in | |
| 7 | consumers of the library. Also, it doesn't make any sense whatsoever. | |
| 8 | For this reason, and the fact that this function is not used at all in | |
| 9 | the file in which it's defined, I have removed the "inline" keyword. | |
| 10 | --- | |
| 11 | doc/Doxyfile.in | 2 +- | |
| 12 | include/netlink/object.h | 2 +- | |
| 13 | lib/object.c | 2 +- | |
| 14 | 3 files changed, 3 insertions(+), 3 deletions(-) | |
| 15 | ||
| 16 | diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in | |
| 17 | index 0c518b7..396fcbc 100644 | |
| 18 | --- a/doc/Doxyfile.in | |
| 19 | +++ b/doc/Doxyfile.in | |
| 20 | @@ -113,7 +113,7 @@ FULL_PATH_NAMES = YES | |
| 21 | # If left blank the directory from which doxygen is run is used as the | |
| 22 | # path to strip. | |
| 23 | ||
| 24 | -STRIP_FROM_PATH = | |
| 25 | +STRIP_FROM_PATH = /home/pjones/build/BUILD/libnl-1.1 | |
| 26 | ||
| 27 | # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of | |
| 28 | # the path mentioned in the documentation of a class, which tells | |
| 29 | diff --git a/include/netlink/object.h b/include/netlink/object.h | |
| 30 | index 751a1b3..241a2ad 100644 | |
| 31 | --- a/include/netlink/object.h | |
| 32 | +++ b/include/netlink/object.h | |
| 33 | @@ -55,7 +55,7 @@ extern int nl_object_is_marked(struct nl_object *); | |
| 34 | /* Access Functions */ | |
| 35 | extern int nl_object_get_refcnt(struct nl_object *); | |
| 36 | extern struct nl_cache * nl_object_get_cache(struct nl_object *); | |
| 37 | -extern inline void * nl_object_priv(struct nl_object *); | |
| 38 | +extern void * nl_object_priv(struct nl_object *); | |
| 39 | ||
| 40 | #ifdef __cplusplus | |
| 41 | } | |
| 42 | diff --git a/lib/object.c b/lib/object.c | |
| 43 | index 74f6e2d..845ca1d 100644 | |
| 44 | --- a/lib/object.c | |
| 45 | +++ b/lib/object.c | |
| 46 | @@ -376,7 +376,7 @@ struct nl_cache *nl_object_get_cache(struct nl_object *obj) | |
| 47 | return obj->ce_cache; | |
| 48 | } | |
| 49 | ||
| 50 | -inline void *nl_object_priv(struct nl_object *obj) | |
| 51 | +void *nl_object_priv(struct nl_object *obj) | |
| 52 | { | |
| 53 | return obj; | |
| 54 | } | |
| 55 | -- | |
| 56 | 1.6.2.2 | |
| 57 |