prelude-lml/master: Remove libmissing.h dependency
[email protected] Thu, 16 Jul 2009 15:42:30 +0200 (CEST)
| Newsgroups | gmane.comp.security.ids.prelude.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit 456baf92274c9fca7ae4af19267a406a299c5a62 Author: Yoann Vandoorselaere <[email protected]> Date: Thu Jul 16 10:57:39 2009 +0200 Remove libmissing.h dependency GnuLib now provide replacement header with standard name, which is much cleaner. ======================================== plugins/debug/debug.c | 3 +- plugins/pcre/pcre-mod.c | 1 - plugins/pcre/rule-object.c | 2 +- plugins/pcre/rule-regex.c | 1 - plugins/pcre/value-container.c | 1 - src/file-server.c | 2 +- src/include/Makefile.am | 1 - src/include/libmissing.h | 43 ---------------------------------------- src/lml-options.c | 1 - src/log-source.c | 1 - src/prelude-lml.c | 1 - src/udp-server.c | 3 +- 12 files changed, 5 insertions(+), 55 deletions(-) ======================================== diff --git a/plugins/debug/debug.c b/plugins/debug/debug.c index ae0a139..f5efa2c 100644 --- a/plugins/debug/debug.c +++ b/plugins/debug/debug.c @@ -21,10 +21,11 @@ * *****/ -#include "libmissing.h" +#include "config.h" #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <libprelude/prelude.h> #include "prelude-lml.h" diff --git a/plugins/pcre/pcre-mod.c b/plugins/pcre/pcre-mod.c index 6a226d7..a79e346 100644 --- a/plugins/pcre/pcre-mod.c +++ b/plugins/pcre/pcre-mod.c @@ -22,7 +22,6 @@ *****/ #include "config.h" -#include "libmissing.h" #include <stdio.h> #include <string.h> diff --git a/plugins/pcre/rule-object.c b/plugins/pcre/rule-object.c index 664ac9c..26d4ac4 100644 --- a/plugins/pcre/rule-object.c +++ b/plugins/pcre/rule-object.c @@ -23,13 +23,13 @@ *****/ #include "config.h" -#include "libmissing.h" #include <stdio.h> #include <string.h> #include <ctype.h> #include <sys/types.h> #include <pcre.h> +#include <netdb.h> #include <libprelude/prelude.h> #include <libprelude/common.h> diff --git a/plugins/pcre/rule-regex.c b/plugins/pcre/rule-regex.c index 3e3b559..bfcf0be 100644 --- a/plugins/pcre/rule-regex.c +++ b/plugins/pcre/rule-regex.c @@ -22,7 +22,6 @@ *****/ #include "config.h" -#include "libmissing.h" #include <stdio.h> #include <string.h> diff --git a/plugins/pcre/value-container.c b/plugins/pcre/value-container.c index 1369486..07b04d8 100644 --- a/plugins/pcre/value-container.c +++ b/plugins/pcre/value-container.c @@ -22,7 +22,6 @@ *****/ #include "config.h" -#include "libmissing.h" #include <stdio.h> #include <string.h> diff --git a/src/file-server.c b/src/file-server.c index a5f90e6..fdfa6c7 100644 --- a/src/file-server.c +++ b/src/file-server.c @@ -22,7 +22,6 @@ *****/ #include "config.h" -#include "libmissing.h" #include <stdio.h> #include <string.h> @@ -61,6 +60,7 @@ #include "file-server.h" #include "lml-alert.h" #include "lml-options.h" +#include "pathmax.h" #ifndef MIN diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 0e08147..b377683 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -2,7 +2,6 @@ includedir = $(prefix)/include/prelude-lml noinst_HEADERS = \ common.h \ - libmissing.h \ lml-alert.h \ lml-options.h \ log-entry.h \ diff --git a/src/include/libmissing.h b/src/include/libmissing.h deleted file mode 100644 index 9bfb56c..0000000 --- a/src/include/libmissing.h +++ /dev/null @@ -1,43 +0,0 @@ -/***** -* -* Copyright (C) 2004, 2005 PreludeIDS Technologies. All Rights Reserved. -* Author: Yoann Vandoorselaere <[email protected]> -* -* This file is part of the Prelude-LML program. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2, or (at your option) -* any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; see the file COPYING. If not, write to -* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -* -*****/ - -/* - * should be in $(top_srcdir)/libmissing, but since the Makefile.am - * is generated dynamically by gnulib-tool, it can't go there. - */ - -#ifndef _PRELUDE_LML_LIBMISSING_H -#define _PRELUDE_LML_LIBMISSING_H - -#include "config.h" - -#include <glob.h> -#include <stdio.h> -#include <string.h> -#include <sys/socket.h> -#include <sys/types.h> -#include <time.h> -#include "getaddrinfo.h" -#include "pathmax.h" - -#endif /* _PRELUDE_LML_LIBMISSING_H */ diff --git a/src/lml-options.c b/src/lml-options.c index d2992bf..8051735 100644 --- a/src/lml-options.c +++ b/src/lml-options.c @@ -22,7 +22,6 @@ *****/ #include "config.h" -#include "libmissing.h" #include <stdio.h> #include <ctype.h> diff --git a/src/log-source.c b/src/log-source.c index 000b20c..1115d76 100644 --- a/src/log-source.c +++ b/src/log-source.c @@ -22,7 +22,6 @@ *****/ #include "config.h" -#include "libmissing.h" #include <stdio.h> #include <stdarg.h> diff --git a/src/prelude-lml.c b/src/prelude-lml.c index 7df1594..a702305 100644 --- a/src/prelude-lml.c +++ b/src/prelude-lml.c @@ -22,7 +22,6 @@ *****/ #include "config.h" -#include "libmissing.h" #include <stdio.h> #include <ctype.h> diff --git a/src/udp-server.c b/src/udp-server.c index fba5d2c..80dd34b 100644 --- a/src/udp-server.c +++ b/src/udp-server.c @@ -22,15 +22,14 @@ *****/ #include "config.h" -#include "libmissing.h" #include <stdio.h> #include <string.h> #include <stdlib.h> #include <unistd.h> -#include <netinet/in.h> #include <sys/socket.h> #include <arpa/inet.h> +#include <netdb.h> #include <libprelude/common.h> #include <libprelude/prelude-log.h> _______________________________________________ Prelude-cvslog site list [email protected] http://lists.prelude-ids.org/mailman/listinfo/prelude-cvslog