Changeset 292


Ignore:
Timestamp:
Sep 5, 2010, 8:57:06 PM (14 years ago)
Author:
katerina
Message:

Fix for compile problems on Solaris 10 (ticket #220).

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.in

    r290 r292  
    17511751dnmalloc.o: $(srcsrc)/dnmalloc.c Makefile config.h
    17521752t-test1.o: $(srcsrc)/t-test1.c Makefile config.h $(srcinc)/malloc.h
    1753 sh_port2proc.o: $(srcsrc)/sh_port2proc.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error_min.h $(srcinc)/sh_pthread.h
     1753sh_port2proc.o: $(srcsrc)/sh_port2proc.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error_min.h $(srcinc)/sh_pthread.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h
    17541754sh_log_parse_syslog.o: $(srcsrc)/sh_log_parse_syslog.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h
    17551755sh_log_parse_pacct.o: $(srcsrc)/sh_log_parse_pacct.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h

  • trunk/configure.ac

    r291 r292  
    1212dnl start
    1313dnl
    14 AM_INIT_AUTOMAKE(samhain, 2.7.2a)
     14AM_INIT_AUTOMAKE(samhain, 2.7.2b)
    1515AC_DEFINE([SAMHAIN], 1, [Application is samhain])
    1616AC_CANONICAL_HOST

  • trunk/depend.dep

    r290 r292  
    6868dnmalloc-portable.o: $(srcsrc)/dnmalloc-portable.c Makefile config.h
    6969dnmalloc.o: $(srcsrc)/dnmalloc.c Makefile config.h
    70 sh_port2proc.o: $(srcsrc)/sh_port2proc.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error_min.h $(srcinc)/sh_pthread.h
     70sh_port2proc.o: $(srcsrc)/sh_port2proc.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error_min.h $(srcinc)/sh_pthread.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h
    7171sh_log_parse_syslog.o: $(srcsrc)/sh_log_parse_syslog.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h
    7272sh_log_parse_pacct.o: $(srcsrc)/sh_log_parse_pacct.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h

  • trunk/depend.sum

    r290 r292  
    1 3512130170
     12431182974

  • trunk/docs/Changelog

    r291 r292  
     12.7.2b:
     2        * Fix compile errors on Solaris 10 (reported by A. Saheba)
     3
    142.7.2a:
    25        * rewrote rijndaelKeySched() in a more conservative way to fix

  • trunk/src/make-tests.sh

    r203 r292  
    1818/* This is auto-generated code. Edit at your own peril. */
    1919
     20#include "config.h"
    2021#include <stdio.h>
    2122#include "CuTest.h"
    22 #include "config.h"
    23 
    2423'
    2524

  • trunk/src/sh_log_parse_pacct.c

    r203 r292  
    116116  BIT(ACOMPAT, 'C');
    117117#endif
     118#ifdef ACORE
    118119  BIT(ACORE, 'D');
     120#endif
     121#ifdef AXSIG
    119122  BIT(AXSIG, 'X');
     123#endif
    120124
    121125  out[i] = '\0';

  • trunk/src/sh_log_parse_samba.c

    r186 r292  
    1717#include "config_xor.h"
    1818#include <string.h>
     19
     20#if defined(HOST_IS_SOLARIS)
     21/* For 'struct timeval' in <sys/time.h> */
     22#define __EXTENSIONS__
     23#endif
     24
    1925#include <time.h>
    2026

  • trunk/src/sh_log_parse_syslog.c

    r265 r292  
    2020#include <stdlib.h>
    2121#include <string.h>
     22
     23#if defined(HOST_IS_SOLARIS)
     24/* For 'struct timeval' in <sys/time.h> */
     25#define __EXTENSIONS__
     26#endif
     27
    2228#include <sys/types.h>
    2329#include <time.h>

  • trunk/src/sh_mem.c

    r257 r292  
    112112#endif
    113113
    114 static void ** sh_mem_merr_1;
     114static memlist_t ** sh_mem_merr_1;
    115115
    116116void sh_mem_stat ()
    … …  
    121121  SL_ENTER(_("sh_mem_stat"));
    122122
    123   sh_mem_merr_1 = (void **) &merrlist;
     123  sh_mem_merr_1 = (memlist_t **) &merrlist;
    124124
    125125  if (Alloc_Count == Free_Count)
    … …  
    166166}
    167167
    168 static void ** sh_mem_merr_2;
     168static memlist_t ** sh_mem_merr_2;
    169169
    170170void sh_mem_check ()
    … …  
    177177  SL_ENTER(_("sh_mem_check"));
    178178
    179   sh_mem_merr_2 = (void **) &merrlist;
     179  sh_mem_merr_2 = (memlist_t **) &merrlist;
    180180
    181181  sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_MSTAMP,
    … …  
    317317
    318318static void ** sh_mem_dummy_a;
    319 static void ** sh_mem_merr_3;
     319static memlist_t ** sh_mem_merr_3;
    320320
    321321void sh_mem_free (void * aa, char * file, int line)
    … …  
    333333  a      = aa;
    334334  sh_mem_dummy_a = &a;
    335   sh_mem_merr_3  = (void **) &merrlist;
     335  sh_mem_merr_3  = (memlist_t **) &merrlist;
    336336
    337337

  • trunk/src/sh_port2proc.c

    r290 r292  
    973973#else /* !defined(__linux__) && !defined(__FreeBSD__) */
    974974
     975#include "samhain.h"
     976#include "sh_utils.h"
     977
    975978char * sh_port2proc_query(int proto, struct in_addr * saddr, int sport,
    976979                          unsigned long * pid, char * user, size_t userlen)
Note: See TracChangeset for help on using the changeset viewer.