Changeset 583 for trunk/include


Ignore:
Timestamp:
Nov 13, 2024, 2:47:31 PM (6 weeks ago)
Author:
katerina
Message:

Fix for ticket #471 (autoreconf throws warnings/errors).

Location:
trunk/include
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/sh_trace.h

    r481 r583  
    55/* This file should be included via samhain.h only.
    66 */
     7#ifdef SL_DEBUG
     8#define SDG_0RETU _("return.\n")
     9#define SDG_TERRO _("ERROR: file=<%s>, line=<%d>, reason=<%s>\n")
     10#define SDG_AERRO _("ERROR: file=<%s>, line=<%d>, failed_assertion=<%s>\n")
     11#define SDG_AFAIL _("FAILED: file=<%s>, line=<%d>, assertion=<%s>\n")
     12#define SDG_ENTER _("enter=<%s>\n")
     13#define SDG_RETUR _("return=<%s>.\n")
     14#define SDG_ERROR _("error=<%ld>.\n")
     15#endif
    716
    817#ifdef SL_DEBUG
  • trunk/include/sh_unix.h

    r580 r583  
    391391
    392392#ifdef HAVE_GETTIMEOFDAY
    393 #if TIME_WITH_SYS_TIME
    394 #include <sys/time.h>
    395 #include <time.h>
    396 #else
    397393#if HAVE_SYS_TIME_H
    398394#include <sys/time.h>
    399 #else
     395#endif
    400396#include <time.h>
    401 #endif
    402 #endif
    403397#endif
    404398
  • trunk/include/slib.h

    r568 r583  
    533533    /*@i@*/ if (assertion) ;                           \
    534534    else {                                             \
    535         dlog(0, FIL__, __LINE__, SDG_AFAIL,            \
     535        dlog(0, FIL__, __LINE__, _("FAILED: file=<%s>, line=<%d>, assertion=<%s>\n"),            \
    536536                 FIL__, __LINE__, astext);             \
    537537        _exit(EXIT_FAILURE);                           \
     
    621621do {                                                                \
    622622   if((long)(x) < 0) {                                              \
    623       TPT((0,    FIL__, __LINE__, SDG_ERROR, (long)(x)))            \
     623      TPT((0,    FIL__, __LINE__, _("error=<%ld>.\n"), (long)(x)))            \
    624624      sl_errno=(x);                                                 \
    625625    }                                                               \
Note: See TracChangeset for help on using the changeset viewer.