X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=ossec-hids.git;a=blobdiff_plain;f=src%2Fheaders%2Fshared.h;h=fe2827c9390830857b27e14afb23208f10fa6e67;hp=4165c5b447a06393ad1f96df965c5a11ab99670d;hb=6ef2f786c6c8ead94841b5f93baf9f43421f08c8;hpb=301048b51990573e58a30dc4a5bb4ec285cad554 diff --git a/src/headers/shared.h b/src/headers/shared.h index 4165c5b..fe2827c 100755 --- a/src/headers/shared.h +++ b/src/headers/shared.h @@ -1,4 +1,5 @@ -/* @(#) $Id$ */ +/* @(#) $Id: ./src/headers/shared.h, 2011/09/08 dcid Exp $ + */ /* Copyright (C) 2009 Trend Micro Inc. * All rights reserved. @@ -18,7 +19,7 @@ * The stack smashing protector defeats some BoF via: gcc -fstack-protector * Reference: http://gcc.gnu.org/onlinedocs/gcc-4.1.2/cpp.pdf */ - + #if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1) && (__GNUC_PATCHLEVEL__ >= 2)) || \ ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || \ (__GNUC__ >= 5)) @@ -82,6 +83,8 @@ #include #include #include +#include +#include #endif #include @@ -175,7 +178,7 @@ char *__local_name; /*** These functions will exit on error. No need to check return code ***/ /* for calloc: x = calloc(4,sizeof(char)) -> os_calloc(4,sizeof(char),x) */ -#define os_calloc(x,y,z) (z = calloc(x,y))?(void)1:ErrorExit(MEM_ERROR, ARGV0) +#define os_calloc(x,y,z) (z = calloc(x,y))?(void)1:ErrorExit(MEM_ERROR, ARGV0) #define os_strdup(x,y) (y = strdup(x))?(void)1:ErrorExit(MEM_ERROR, ARGV0) @@ -190,9 +193,9 @@ char *__local_name; #ifdef CLIENT #define isAgent 1 #else - #define isAgent 0 + #define isAgent 0 #endif - + #include "debug_op.h" @@ -216,6 +219,7 @@ char *__local_name; #include "file-queue.h" #include "read-agents.h" #include "report_op.h" +#include "string_op.h" #include "os_xml/os_xml.h" #include "os_regex/os_regex.h" @@ -224,5 +228,5 @@ char *__local_name; #endif /* __SHARED_H */ - + /* EOF */