kopia lustrzana https://github.com/Hamlib/Hamlib
Clean up HAVE_LIBREADLINE mods
rodzic
297bf9aa6b
commit
4be4b7033b
|
@ -411,8 +411,6 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
while (retcode == 0 || retcode == 2);
|
||||
|
||||
#ifdef HAVE_LIBREADLINE
|
||||
|
||||
if (interactive && prompt)
|
||||
{
|
||||
#ifdef HAVE_READLINE_HISTORY
|
||||
|
@ -436,7 +434,6 @@ int main(int argc, char *argv[])
|
|||
#endif /* HAVE_READLINE_HISTORY */
|
||||
}
|
||||
|
||||
#endif /* HAVE_LIBREADLINE */
|
||||
amp_close(my_amp); /* close port */
|
||||
amp_cleanup(my_amp); /* if you care about memory */
|
||||
|
||||
|
|
|
@ -478,9 +478,7 @@ int ampctl_parse(AMP *my_amp, FILE *fin, FILE *fout, char *argv[], int argc)
|
|||
#endif
|
||||
|
||||
/* cmd, internal, ampctld */
|
||||
#ifdef HAVE_LIBREADLINE
|
||||
if (!(interactive && prompt && have_rl))
|
||||
#endif
|
||||
{
|
||||
if (interactive)
|
||||
{
|
||||
|
@ -852,8 +850,8 @@ int ampctl_parse(AMP *my_amp, FILE *fin, FILE *fout, char *argv[], int argc)
|
|||
}
|
||||
|
||||
#ifdef HAVE_LIBREADLINE
|
||||
|
||||
if (interactive && prompt && have_rl)
|
||||
#endif
|
||||
{
|
||||
int j, x;
|
||||
|
||||
|
@ -1334,9 +1332,6 @@ int ampctl_parse(AMP *my_amp, FILE *fin, FILE *fout, char *argv[], int argc)
|
|||
#endif
|
||||
}
|
||||
|
||||
#endif /* HAVE_LIBREADLINE */
|
||||
|
||||
|
||||
/*
|
||||
* mutex locking needed because ampctld is multithreaded
|
||||
* and hamlib is not MT-safe
|
||||
|
|
|
@ -618,8 +618,6 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
while (retcode == 0 || retcode == 2 || retcode == -RIG_ENAVAIL);
|
||||
|
||||
#ifdef HAVE_LIBREADLINE
|
||||
|
||||
if (interactive && prompt)
|
||||
{
|
||||
#ifdef HAVE_READLINE_HISTORY
|
||||
|
@ -643,7 +641,6 @@ int main(int argc, char *argv[])
|
|||
#endif /* HAVE_READLINE_HISTORY */
|
||||
}
|
||||
|
||||
#endif /* HAVE_LIBREADLINE */
|
||||
rig_close(my_rig); /* close port */
|
||||
rig_cleanup(my_rig); /* if you care about memory */
|
||||
|
||||
|
|
|
@ -605,9 +605,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
|
|||
vfo_t vfo = RIG_VFO_CURR;
|
||||
|
||||
/* cmd, internal, rigctld */
|
||||
#ifdef HAVE_LIBREADLINE
|
||||
if (!(interactive && prompt && have_rl))
|
||||
#endif
|
||||
{
|
||||
|
||||
if (interactive)
|
||||
|
|
|
@ -898,8 +898,8 @@ int rotctl_parse(ROT *my_rot, FILE *fin, FILE *fout, char *argv[], int argc,
|
|||
}
|
||||
|
||||
#ifdef HAVE_LIBREADLINE
|
||||
|
||||
if (interactive && prompt && have_rl)
|
||||
#endif
|
||||
{
|
||||
int j, x;
|
||||
|
||||
|
@ -1379,9 +1379,6 @@ int rotctl_parse(ROT *my_rot, FILE *fin, FILE *fout, char *argv[], int argc,
|
|||
#endif
|
||||
}
|
||||
|
||||
#endif /* HAVE_LIBREADLINE */
|
||||
|
||||
|
||||
/*
|
||||
* mutex locking needed because rotctld is multithreaded
|
||||
* and hamlib is not MT-safe
|
||||
|
|
Ładowanie…
Reference in New Issue