|
 |
965b082 |
From 84fefcadcde5d6c343db7f5c1744f6b1f070bc71 Mon Sep 17 00:00:00 2001
|
|
|
965b082 |
From: Peter Jones <pjones@redhat.com>
|
|
|
965b082 |
Date: Thu, 14 May 2009 11:30:40 -0400
|
|
|
965b082 |
Subject: [PATCH] Remove "inline" keyword from nl_object_priv().
|
|
|
965b082 |
|
|
|
965b082 |
"extern inline foo();" in a header file generates a compiler warning in
|
|
|
965b082 |
consumers of the library. Also, it doesn't make any sense whatsoever.
|
|
|
965b082 |
For this reason, and the fact that this function is not used at all in
|
|
|
965b082 |
the file in which it's defined, I have removed the "inline" keyword.
|
|
|
965b082 |
---
|
|
|
965b082 |
doc/Doxyfile.in | 2 +-
|
|
|
965b082 |
include/netlink/object.h | 2 +-
|
|
|
965b082 |
lib/object.c | 2 +-
|
|
|
965b082 |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
965b082 |
|
|
|
965b082 |
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
|
|
|
965b082 |
index 0c518b7..396fcbc 100644
|
|
|
965b082 |
--- a/doc/Doxyfile.in
|
|
|
965b082 |
+++ b/doc/Doxyfile.in
|
|
|
965b082 |
@@ -113,7 +113,7 @@ FULL_PATH_NAMES = YES
|
|
|
965b082 |
# If left blank the directory from which doxygen is run is used as the
|
|
|
965b082 |
# path to strip.
|
|
|
965b082 |
|
|
|
965b082 |
-STRIP_FROM_PATH =
|
|
|
965b082 |
+STRIP_FROM_PATH = /home/pjones/build/BUILD/libnl-1.1
|
|
|
965b082 |
|
|
|
965b082 |
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
|
|
|
965b082 |
# the path mentioned in the documentation of a class, which tells
|
|
|
965b082 |
diff --git a/include/netlink/object.h b/include/netlink/object.h
|
|
|
965b082 |
index 751a1b3..241a2ad 100644
|
|
|
965b082 |
--- a/include/netlink/object.h
|
|
|
965b082 |
+++ b/include/netlink/object.h
|
|
|
965b082 |
@@ -55,7 +55,7 @@ extern int nl_object_is_marked(struct nl_object *);
|
|
|
965b082 |
/* Access Functions */
|
|
|
965b082 |
extern int nl_object_get_refcnt(struct nl_object *);
|
|
|
965b082 |
extern struct nl_cache * nl_object_get_cache(struct nl_object *);
|
|
|
965b082 |
-extern inline void * nl_object_priv(struct nl_object *);
|
|
|
965b082 |
+extern void * nl_object_priv(struct nl_object *);
|
|
|
965b082 |
|
|
|
965b082 |
#ifdef __cplusplus
|
|
|
965b082 |
}
|
|
|
965b082 |
diff --git a/lib/object.c b/lib/object.c
|
|
|
965b082 |
index 74f6e2d..845ca1d 100644
|
|
|
965b082 |
--- a/lib/object.c
|
|
|
965b082 |
+++ b/lib/object.c
|
|
|
965b082 |
@@ -376,7 +376,7 @@ struct nl_cache *nl_object_get_cache(struct nl_object *obj)
|
|
|
965b082 |
return obj->ce_cache;
|
|
|
965b082 |
}
|
|
|
965b082 |
|
|
|
965b082 |
-inline void *nl_object_priv(struct nl_object *obj)
|
|
|
965b082 |
+void *nl_object_priv(struct nl_object *obj)
|
|
|
965b082 |
{
|
|
|
965b082 |
return obj;
|
|
|
965b082 |
}
|
|
|
965b082 |
--
|
|
|
965b082 |
1.6.2.2
|
|
|
965b082 |
|