aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-02-02 15:09:23 -05:00
Code

Fix compilation with Perl 5.38

Browse Source 
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
This commit is contained in:
Azamat H. Hackimov 2023-07-03 14:12:22 +03:00
parent 5ca979844b
commit 393bf23a26
3 changed files with 5 additions and 5 deletions
src
main
object.h
protocol
uri.curi.h

6
src/main/object.h

@ -11,7 +11,7 @@ extern "C" {
#define DEBUG_REFCOUNT #define DEBUG_REFCOUNT
#endif #endif
struct object { struct elinks_object {
int refcount; int refcount;
#ifdef CONFIG_DEBUG #ifdef CONFIG_DEBUG
char *name; char *name;
@ -20,10 +20,10 @@ struct object {
#define OBJECT_HEAD(type) \ #define OBJECT_HEAD(type) \
LIST_HEAD_EL(type); \ LIST_HEAD_EL(type); \
struct object object struct elinks_object object
struct object_head { struct object_head {
OBJECT_HEAD(struct object *); OBJECT_HEAD(struct elinks_object *);
}; };
#ifdef DEBUG_REFCOUNT #ifdef DEBUG_REFCOUNT

2
src/protocol/uri.c

@ -1578,7 +1578,7 @@ struct uri_cache_entry {
struct uri_cache { struct uri_cache {
struct hash *map; struct hash *map;
struct object object; struct elinks_object object;
}; };
static struct uri_cache uri_cache; static struct uri_cache uri_cache;

2
src/protocol/uri.h

@ -89,7 +89,7 @@ struct uri {
unsigned int form:1; /* URI originated from form */ unsigned int form:1; /* URI originated from form */
/* Usage count object. */ /* Usage count object. */
struct object object; struct elinks_object object;
}; };
enum uri_errno { enum uri_errno {