From a71f03b18c1f03e1c362e0e56795c4b0df95cb49 Mon Sep 17 00:00:00 2001 From: curt Date: Sat, 9 Sep 2000 15:48:14 +0000 Subject: [PATCH] Explicitely add -lpthread to the link line to avoid a long standing linux ld bug. A couple namespace fixes to avoid problems with latest plib cvs on some systems. --- src/Cockpit/cockpit.hxx | 6 +++--- src/Include/config.h.in | 3 +++ src/NetworkOLK/net_send.cxx | 10 +++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Cockpit/cockpit.hxx b/src/Cockpit/cockpit.hxx index fce2a0a29..5873cd67e 100644 --- a/src/Cockpit/cockpit.hxx +++ b/src/Cockpit/cockpit.hxx @@ -40,12 +40,12 @@ class fg_Cockpit { private: int Code; - int Status; + int cockpitStatus; public: - fg_Cockpit () : Code(1), Status(0) {}; + fg_Cockpit () : Code(1), cockpitStatus(0) {}; int code ( void ) { return Code; } - int status( void ) { return Status; } + int status( void ) { return cockpitStatus; } }; diff --git a/src/Include/config.h.in b/src/Include/config.h.in index a930f361e..2962401d4 100644 --- a/src/Include/config.h.in +++ b/src/Include/config.h.in @@ -225,6 +225,9 @@ /* Define if you have the m library (-lm). */ #undef HAVE_LIBM +/* Define if you have the pthread library (-lpthread). */ +#undef HAVE_LIBPTHREAD + /* Define if you have the socket library (-lsocket). */ #undef HAVE_LIBSOCKET diff --git a/src/NetworkOLK/net_send.cxx b/src/NetworkOLK/net_send.cxx index 5f5e1547a..891e6f6ae 100644 --- a/src/NetworkOLK/net_send.cxx +++ b/src/NetworkOLK/net_send.cxx @@ -90,8 +90,8 @@ extern char *FGFS_host, *net_callsign; /* List-stuff */ -const int True = 0; -const int False= -1; +const int listTrue = 0; +const int listFalse= -1; struct list_ele { /* unsigned */ char ipadr[16], callsign[16]; @@ -198,10 +198,10 @@ struct list_ele *clr_ele; int list_not_in( char name[16]) { - i = True; + i = listTrue; test = head->next; - while ((test != tail) && (i==True)) { - i = (strcmp(test->ipadr, name) ? True : False); + while ((test != tail) && (i==listTrue)) { + i = (strcmp(test->ipadr, name) ? listTrue : listFalse); test = test->next; if (verbose != 0) printf("list_not_in : %d\n",i); } -- 2.39.5