hamradio/Hamlib
1
0
Fork 0
mirror of https://github.com/Hamlib/Hamlib.git synced 2024-09-21 18:37:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

More mingw32 fixes

Browse Source
This commit is contained in:
Michael Black 2020-01-15 17:21:20 -06:00
parent 16f85be147
commit d57cdc1cbf
No known key found for this signature in database
GPG Key ID: 6599353EC683404D
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/ampctl_parse.c
View File

@ -41,10 +41,11 @@
# include <readline/readline.h>
# elif defined(HAVE_READLINE_H) /* !defined(HAVE_READLINE_READLINE_H) */
# include <readline.h>
# else /* !defined(HAVE_READLINE_H) */
extern char *readline();
# endif /* HAVE_READLINE_H */
#else
/* no readline */
extern char *readline();
#endif /* HAVE_LIBREADLINE */
#ifdef HAVE_READLINE_HISTORY
@ -98,10 +99,10 @@ static pthread_mutex_t amp_mutex = PTHREAD_MUTEX_INITIALIZER;
#define ARG_OUT (ARG_OUT1|ARG_OUT2|ARG_OUT3|ARG_OUT4)
/* variables for readline support */
#ifdef HAVE_LIBREADLINE
static char *input_line = (char *)NULL;
static char *result = (char *)NULL;
static char *parsed_input[sizeof(char *) * 7];
#ifdef HAVE_LIBREADLINE
static const int have_rl = 1;
#ifdef HAVE_READLINE_HISTORY
@ -268,6 +269,7 @@ void hash_delete_all()
}
#ifdef HAVE_LIBREADLINE
/* Frees allocated memory and sets pointers to NULL before calling readline
* and then parses the input into space separated tokens.
*/
@ -298,6 +300,7 @@ static void rp_getline(const char *s)
/* Action! Returns typed line with newline stripped. */
input_line = readline(s);
}
#endif
/*
* TODO: use Lex?
@ -845,7 +848,6 @@ 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;
@ -1322,6 +1324,7 @@ 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

7
tests/rigctl_parse.c
View File

@ -41,10 +41,11 @@
# include <readline/readline.h>
# elif defined(HAVE_READLINE_H) /* !defined(HAVE_READLINE_READLINE_H) */
# include <readline.h>
# else /* !defined(HAVE_READLINE_H) */
extern char *readline();
# endif /* HAVE_READLINE_H */
#else
/* no readline */
extern char *readline();
#endif /* HAVE_LIBREADLINE */
#ifdef HAVE_READLINE_HISTORY
@ -401,7 +402,6 @@ void hash_delete_all()
}
}
#ifdef HAVE_LIBREADLINE
/* Frees allocated memory and sets pointers to NULL before calling readline
* and then parses the input into space separated tokens.
@ -430,7 +430,8 @@ static void rp_getline(const char *s)
/* Action! Returns typed line with newline stripped. */
input_line = readline(s);
}
#endif
#endif
/*
* TODO: use Lex?
*/