Commit f085b2dd authored by Daniel Brown's avatar Daniel Brown
Browse files

Merge branch 'janjust' into 'master'

Fix compilation with GCC 10 (Fedora 32)

See merge request !5
parents 485e2e32 687dff32
......@@ -43,6 +43,9 @@ extern interferometer_t inter;
extern options_t options;
extern local_var_t vlocal;
static bbuffer *cq; //!< the main command queue
static int lastid; //!< the last id???
char largebuffer[STRBUFFLEN]; //!< string for read buffer
/*! send a string to the socket descriptor
......
......@@ -77,10 +77,6 @@ typedef struct boundedbuffer {
} bbuffer;
bbuffer *cq; //!< the main command queue
int lastid; //!< the last id???
/* from kat_server.c */
void * create_bounded_buffer(int length);
......
  • We should probably keep the develop branch as well, and not just merge this into master. @janjust.keijser You could do these changes directly in the develop branch or make a new merge.

Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment