Skip to content

[PATCH] Fix conflict with enum from Perl header #404

@SchweinDeBurg

Description

@SchweinDeBurg
diff -up elinks-0.18.0-git/config2.h.in.orig elinks-0.18.0-git/config2.h.in
--- elinks-0.18.0-git/config2.h.in.orig	2025-11-16 18:19:26.000000000 +0300
+++ elinks-0.18.0-git/config2.h.in	2025-11-16 19:07:08.663674423 +0300
@@ -789,7 +789,7 @@
 #mesondefine ICONV_CONST
 
 /* How to invoke XTerm */
-#define XTERM "@XTERM@"
+#define CONFIG_XTERM "@CONFIG_XTERM@"
 
 /* Directory containing libraries */
 #define LIBDIR "@LIBDIR@"
diff -up elinks-0.18.0-git/configure.ac.orig elinks-0.18.0-git/configure.ac
--- elinks-0.18.0-git/configure.ac.orig	2025-11-16 18:19:26.000000000 +0300
+++ elinks-0.18.0-git/configure.ac	2025-11-16 19:06:23.597855043 +0300
@@ -430,7 +430,7 @@ fi
 
 AC_ARG_WITH(xterm, [  --with-xterm            how to invoke the X terminal emulator],
             [ if test "$withval" != no && test "$withval" != yes; then
-		AC_DEFINE_UNQUOTED(XTERM, "$withval", [How to invoke XTerm])
+		AC_DEFINE_UNQUOTED(CONFIG_XTERM, "$withval", [How to invoke XTerm])
 	      fi ])
 
 # ===================================================================
diff -up elinks-0.18.0-git/meson.build.orig elinks-0.18.0-git/meson.build
--- elinks-0.18.0-git/meson.build.orig	2025-11-16 18:19:26.000000000 +0300
+++ elinks-0.18.0-git/meson.build	2025-11-16 19:03:58.353437156 +0300
@@ -70,7 +70,7 @@ conf_data.set('CONFIG_OWN_LIBC', get_opt
 conf_data.set('CONFIG_SMALL', get_option('small'))
 conf_data.set('CONFIG_UTF8', get_option('utf-8'))
 
-conf_data.set('XTERM', get_option('xterm'))
+conf_data.set('CONFIG_XTERM', get_option('xterm'))
 conf_data.set('CONFIG_GPM', get_option('gpm'))
 conf_data.set('CONFIG_TERMINFO', get_option('terminfo'))
 conf_data.set('CONFIG_GZIP', get_option('zlib'))
diff -up elinks-0.18.0-git/src/osdep/newwin.c.orig elinks-0.18.0-git/src/osdep/newwin.c
--- elinks-0.18.0-git/src/osdep/newwin.c.orig	2025-11-16 18:19:26.000000000 +0300
+++ elinks-0.18.0-git/src/osdep/newwin.c	2025-11-16 19:05:15.779126848 +0300
@@ -16,8 +16,8 @@
 #include "util/memory.h"
 #include "util/string.h"
 
-#ifdef XTERM
-#define XTERM_CMD XTERM
+#ifdef CONFIG_XTERM
+#define XTERM_CMD CONFIG_XTERM
 #else
 #define XTERM_CMD DEFAULT_XTERM_CMD
 #endif

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions