mirror of
https://github.com/rkd77/elinks.git
synced 2024-11-04 08:17:17 -05:00
Fix compilation with Perl 5.38 . Refs #256
Perl now includes own `struct object` which clashes with elinks
implementation. Renamed `struct object` to `struct elinks_object` to
avoid it.
Bug: https://bugs.gentoo.org/909042
(cherry picked from commit 393bf23a26
)
This commit is contained in:
parent
a91b47ee7a
commit
5b1b478a07
@ -11,7 +11,7 @@ extern "C" {
|
||||
#define DEBUG_REFCOUNT
|
||||
#endif
|
||||
|
||||
struct object {
|
||||
struct elinks_object {
|
||||
int refcount;
|
||||
#ifdef CONFIG_DEBUG
|
||||
char *name;
|
||||
@ -19,11 +19,11 @@ struct object {
|
||||
};
|
||||
|
||||
#define OBJECT_HEAD(type) \
|
||||
LIST_HEAD(type); \
|
||||
struct object object
|
||||
LIST_HEAD_EL(type); \
|
||||
struct elinks_object object
|
||||
|
||||
struct object_head {
|
||||
OBJECT_HEAD(struct object *);
|
||||
OBJECT_HEAD(struct elinks_object *);
|
||||
};
|
||||
|
||||
#ifdef DEBUG_REFCOUNT
|
||||
|
@ -1578,7 +1578,7 @@ struct uri_cache_entry {
|
||||
|
||||
struct uri_cache {
|
||||
struct hash *map;
|
||||
struct object object;
|
||||
struct elinks_object object;
|
||||
};
|
||||
|
||||
static struct uri_cache uri_cache;
|
||||
|
@ -89,7 +89,7 @@ struct uri {
|
||||
unsigned int form:1; /* URI originated from form */
|
||||
|
||||
/* Usage count object. */
|
||||
struct object object;
|
||||
struct elinks_object object;
|
||||
};
|
||||
|
||||
enum uri_errno {
|
||||
|
Loading…
Reference in New Issue
Block a user