[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: icinga.c: remove conditional main( ) configuration (Andreas Ericsson)

git at icinga.org git at icinga.org
Wed May 12 18:57:42 CEST 2010


Module: icinga-core
Branch: mfriedrich/core
Commit: 3d3dabd44971f29df41bbe7e1d6a295d2e3990cb
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=3d3dabd44971f29df41bbe7e1d6a295d2e3990cb

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed May 12 16:24:13 2010 +0200

icinga.c: remove conditional main() configuration (Andreas Ericsson)

[--snip--]
It doesn't hurt us to have the third argument to main(), so let's just
use it regardless of embedded perl being compiled in or not.
[--snip--]

no problems in removing that on Icinga too.

fixes #391

---

 Changelog     |    1 +
 base/icinga.c |    4 ----
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 71ce6e9..21dff71 100644
--- a/Changelog
+++ b/Changelog
@@ -22,6 +22,7 @@ FIXES
 * core: remove dead code (Andreas Ericsson)
 * core: introduce common/shared.c and include/shared.h (Andreas Ericsson)
 * core: move cgiutils.h compile time option macros to config.h (Andreas Ericsson)
+* core: icinga.c: remove conditional main() configuration (Andreas Ericsson)
 
 * idoutils: Host DB inserts use string 'NULL\n' instead of NULL (William Preston)
 * idoutils: ndo2db_get_object_id fails to return existing IDs (William Preston)
diff --git a/base/icinga.c b/base/icinga.c
index 290b1ff..1fc30ac 100644
--- a/base/icinga.c
+++ b/base/icinga.c
@@ -274,11 +274,7 @@ unsigned long   max_debug_file_size=DEFAULT_MAX_DEBUG_FILE_SIZE;
 
 
 /* Following main() declaration required by older versions of Perl ut 5.00503 */
-#ifdef EMBEDDEDPERL
 int main(int argc, char **argv, char **env){
-#else
-int main(int argc, char **argv){
-#endif
 	int result;
 	int error=FALSE;
 	char *buffer=NULL;





More information about the icinga-checkins mailing list