luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream fixes in scconfig parameter mismatch on find_lesstif2_exthi() function declaration

This commit is contained in:
Stefan Frederik 2021-11-07 11:12:42 +01:00
parent 9fd56b8f91
commit f5df2afc44
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scconfig/src/gui/find_lesstif2.c
View File

@ -27,7 +27,7 @@
#include "db.h"
#include "dep.h"
int find_lesstif2(const char *name, int logdepth, int fatal, const char *call, const char *arg)
int find_lesstif2(const char *name, int logdepth, int fatal)
{
const char *test_c =
NL "#include <Xm/MainW.h>"
@ -47,8 +47,6 @@ int find_lesstif2(const char *name, int logdepth, int fatal, const char *call, c
const char *node = "libs/gui/lesstif2";
char **cflags, *cflags_arr[] = {"", "-I/opt/X11/include", NULL};
char **ldflags, *ldflags_arr[] = {"-lXm -lX11", "-lXm -lXt", "-L/opt/X11/lib -lXm -lXt -lX11", NULL}; /* note: -lXt must be after -lXm else lesstif fails to init with runtime error */
(void) call; /* not used */
(void) arg; /* not used */
if (require("cc/cc", logdepth, fatal))
return 1;
@ -68,7 +66,7 @@ int find_lesstif2(const char *name, int logdepth, int fatal, const char *call, c
}
int find_lesstif2_exthi(const char *name, int logdepth, int fatal) /* , const char *call, const char *arg) */
int find_lesstif2_exthi(const char *name, int logdepth, int fatal)
{
const char *test_c =
NL "#include <Xm/MainW.h>"
@ -79,11 +77,7 @@ int find_lesstif2_exthi(const char *name, int logdepth, int fatal) /* , const ch
NL;
const char *node = "libs/gui/lesstif2/exthi";
// char **cflags, *cflags_arr[] = {"", "-I/opt/X11/include", NULL};
// char **ldflags, *ldflags_arr[] = {"-lXm -lX11", "-lXm -lXt", "-L/opt/X11/lib -lXm -lXt -lX11", NULL}; /* note: -lXt must be after -lXm else lesstif fails to init with runtime error */
const char *cflags, *ldflags;
/* (void) call; */ /* not used */
/* (void) arg; */ /* not used */
if (require("cc/cc", logdepth, fatal) || require("libs/gui/lesstif2", logdepth, fatal))
return 1;

2
scconfig/src/gui/find_lesstif2.h
View File

@ -1,2 +1,2 @@
int find_lesstif2(const char *name, int logdepth, int fatal);
int find_lesstif2_exthi(const char *name, int logdepth, int fatal); /* , const char *call, const char *arg); */
int find_lesstif2_exthi(const char *name, int logdepth, int fatal);