From f5431a953c90b0e09d23c549daf282a5f0a4da5d Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sun, 15 Jul 2012 13:07:12 +0200 Subject: [PATCH] Build fixes for *NIX. --- base/asynctask.h | 2 +- base/process.cpp | 2 +- base/scripttask.cpp | 2 +- dyn/config_lexer.cc | 28 +++++++--------------------- 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/base/asynctask.h b/base/asynctask.h index 7569cfab8..4d42a49eb 100644 --- a/base/asynctask.h +++ b/base/asynctask.h @@ -61,7 +61,7 @@ public: typedef shared_ptr > Ptr; typedef weak_ptr > WeakPtr; - typedef function&)> CompletionCallback; + typedef function&)> CompletionCallback; /** * Constructor for the AsyncTask class. diff --git a/base/process.cpp b/base/process.cpp index 7e92b1cc2..4232647d4 100644 --- a/base/process.cpp +++ b/base/process.cpp @@ -31,7 +31,7 @@ deque Process::m_Tasks; condition_variable Process::m_TasksCV; Process::Process(const string& command, const CompletionCallback& completionCallback) - : AsyncTask(completionCallback), m_Command(command), m_UsePopen(false) + : AsyncTask(completionCallback), m_Command(command), m_UsePopen(false) { if (!m_ThreadCreated) { thread t(&Process::WorkerThreadProc); diff --git a/base/scripttask.cpp b/base/scripttask.cpp index 9956d4e4e..1066729f7 100644 --- a/base/scripttask.cpp +++ b/base/scripttask.cpp @@ -3,7 +3,7 @@ using namespace icinga; ScriptTask::ScriptTask(const ScriptFunction::Ptr& function, const vector& arguments, CompletionCallback callback) - : AsyncTask(callback), m_Function(function), m_Arguments(arguments) + : AsyncTask(callback), m_Function(function), m_Arguments(arguments) { } void ScriptTask::Run(void) diff --git a/dyn/config_lexer.cc b/dyn/config_lexer.cc index ea13ff2d4..66a306750 100644 --- a/dyn/config_lexer.cc +++ b/dyn/config_lexer.cc @@ -53,6 +53,7 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -83,8 +84,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -158,15 +157,7 @@ typedef void* yyscan_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -546,7 +537,7 @@ do { \ } while (0) #define YY_NO_UNISTD_H 1 -#line 550 "config_lexer.cc" +#line 541 "config_lexer.cc" #define INITIAL 0 #define IN_C_COMMENT 1 @@ -684,12 +675,7 @@ static int input (yyscan_t yyscanner ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -708,7 +694,7 @@ static int input (yyscan_t yyscanner ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + unsigned n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -795,7 +781,7 @@ YY_DECL #line 49 "config_lexer.ll" -#line 799 "config_lexer.cc" +#line 785 "config_lexer.cc" yylval = yylval_param; @@ -1007,7 +993,7 @@ YY_RULE_SETUP #line 79 "config_lexer.ll" ECHO; YY_BREAK -#line 1011 "config_lexer.cc" +#line 997 "config_lexer.cc" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(IN_C_COMMENT): yyterminate(); @@ -1788,8 +1774,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */ -- 2.40.0