Changeset 583 for trunk/src


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

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

Location:
trunk/src
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/minilzo.c

    r455 r583  
    8282#else
    8383#  include <sys/types.h>
    84 #  if defined(STDC_HEADERS)
     84#  if defined(__STDC__)
    8585#    include <string.h>
    8686#    include <stdlib.h>
    87 #  endif
    88 #  if defined(HAVE_STDDEF_H)
    8987#    include <stddef.h>
    90 #  endif
    91 #  if defined(HAVE_MEMORY_H)
    9288#    include <memory.h>
    9389#  endif

  • trunk/src/samhain.c

    r579 r583  
    3434#include <errno.h>
    3535
    36 
    37 #if TIME_WITH_SYS_TIME
    38 #include <sys/time.h>
    39 #include <time.h>
    40 #else
    4136#if HAVE_SYS_TIME_H
    4237#include <sys/time.h>
    43 #else
     38#endif
    4439#include <time.h>
    45 #endif
    46 #endif
    4740
    4841#ifdef HAVE_MEMORY_H

  • trunk/src/sh_entropy.c

    r541 r583  
    3030#endif
    3131
    32 #if TIME_WITH_SYS_TIME
    33 #include <sys/time.h>
    34 #include <time.h>
    35 #else
    3632#if HAVE_SYS_TIME_H
    3733#include <sys/time.h>
    38 #else
     34#endif
    3935#include <time.h>
    40 #endif
    41 #endif
    42 
    4336
    4437#include <stdlib.h>

  • trunk/src/sh_extern.c

    r570 r583  
    7474#include <sys/wait.h>
    7575
    76 #if TIME_WITH_SYS_TIME
    77 #include <sys/time.h>
    78 #include <time.h>
    79 #else
    8076#if HAVE_SYS_TIME_H
    8177#include <sys/time.h>
    82 #else
     78#endif
    8379#include <time.h>
    84 #endif
    85 #endif
    86 
    8780
    8881#include "samhain.h"

  • trunk/src/sh_getopt.c

    r550 r583  
    624624  fprintf (stdout,
    625625           _("This is samhain (%s), "\
    626              "(c) 1999-2008 Rainer Wichmann (http://la-samhna.de).\n"),
     626             "(c) 1999-2024 Rainer Wichmann (http://la-samhna.de).\n"),
    627627           VERSION);
    628628  fprintf (stdout, "%s",_("This software comes with ABSOLUTELY NO WARRANTY. "));
    … …  
    714714  fprintf (stdout,
    715715           _("This is samhain (%s), "\
    716              "(c) 1999-2006 Rainer Wichmann (http://la-samhna.de).\n"),
     716             "(c) 1999-2024 Rainer Wichmann (http://la-samhna.de).\n"),
    717717           VERSION);
    718718  fprintf (stdout, "%s",_("This software comes with ABSOLUTELY NO WARRANTY. "));

  • trunk/src/sh_hash.c

    r580 r583  
    28822882}
    28832883
    2884 #if TIME_WITH_SYS_TIME
    2885 #include <sys/time.h>
    2886 #include <time.h>
    2887 #else
    28882884#if HAVE_SYS_TIME_H
    28892885#include <sys/time.h>
    2890 #else
     2886#endif
    28912887#include <time.h>
    2892 #endif
    2893 #endif
    28942888
    28952889static int ListFullDetail    = S_FALSE;

  • trunk/src/sh_html.c

    r481 r583  
    2424#include <stdlib.h>
    2525
    26 #if TIME_WITH_SYS_TIME
    27 #include <sys/time.h>
    28 #include <time.h>
    29 #else
    3026#if HAVE_SYS_TIME_H
    3127#include <sys/time.h>
    32 #else
     28#endif
    3329#include <time.h>
    34 #endif
    35 #endif
     30
    3631#include <unistd.h>
    3732

  • trunk/src/sh_login_track.c

    r562 r583  
    5858
    5959
    60 #if TIME_WITH_SYS_TIME
    61 #include <sys/time.h>
    62 #include <time.h>
    63 #else
    6460#if HAVE_SYS_TIME_H
    6561#include <sys/time.h>
    66 #else
     62#endif
    6763#include <time.h>
    68 #endif
    69 #endif
    70 
    7164
    7265#define SH_LTRACK_VERSION 1

  • trunk/src/sh_mail.c

    r481 r583  
    3434#if defined(SH_WITH_MAIL)
    3535
    36 #if TIME_WITH_SYS_TIME
    37 #include <sys/time.h>
    38 #include <time.h>
    39 #else
    4036#if HAVE_SYS_TIME_H
    4137#include <sys/time.h>
    42 #else
     38#endif
    4339#include <time.h>
    44 #endif
    45 #endif
    46 
    4740
    4841#ifdef HAVE_MEMORY_H

  • trunk/src/sh_prelude.c

    r542 r583  
    4141#include <sys/types.h>
    4242
    43 #if TIME_WITH_SYS_TIME
    44 
    45 # include <sys/time.h>
    46 # include <time.h>
    47 
    48 #else
    49 
    50 # if HAVE_SYS_TIME_H
    51 #  include <sys/time.h>
    52 # else
    53 #  include <time.h>
    54 # endif
    55 
    56 #endif
     43#if HAVE_SYS_TIME_H
     44#include <sys/time.h>
     45#endif
     46#include <time.h>
    5747
    5848#include <unistd.h>

  • trunk/src/sh_schedule.c

    r481 r583  
    4242#endif
    4343
    44 #if TIME_WITH_SYS_TIME
    45 #include <sys/time.h>
    46 #include <time.h>
    47 #else
    4844#if HAVE_SYS_TIME_H
    4945#include <sys/time.h>
    50 #else
     46#endif
    5147#include <time.h>
    52 #endif
    53 #endif
    5448
    5549#include "samhain.h"

  • trunk/src/sh_socket.c

    r524 r583  
    3333#include <string.h>
    3434
    35 #if TIME_WITH_SYS_TIME
    36 #include <sys/time.h>
    37 #include <time.h>
    38 #else
    3935#if HAVE_SYS_TIME_H
    4036#include <sys/time.h>
    41 #else
     37#endif
    4238#include <time.h>
    43 #endif
    44 #endif
    4539
    4640#include "samhain.h"

  • trunk/src/sh_srp.c

    r560 r583  
    2828
    2929#ifdef USE_SRP_PROTOCOL
     30
     31/* dont modify this, unless you know what you do
     32 */
     33#define SRP_GENERATOR_1024      "2"
     34#define SRP_MODULUS_1024_1        \
     35_("f488fd584e49dbcd20b49de49107366b336c380d451d0f7c88b31c7c5b2d8ef6")
     36#define SRP_MODULUS_1024_2        \
     37_("f3c923c043f0a55b188d8ebb558cb85d38d334fd7c175743a31d186cde33212c")
     38#define SRP_MODULUS_1024_3        \
     39_("b52aff3ce1b1294018118d7c84a70a72d686c40319c807297aca950cd9969fab")
     40#define SRP_MODULUS_1024_4        \
     41_("d00a509b0246d3083d66a45d419f9c7cbd894b221926baaba25ec355e92f78c7")
     42
    3043
    3144#if (defined (SH_WITH_CLIENT) || defined (SH_WITH_SERVER))

  • trunk/src/sh_suidchk.c

    r543 r583  
    4242#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
    4343
    44 #if TIME_WITH_SYS_TIME
    45 #include <sys/time.h>
    46 #include <time.h>
    47 #else
    4844#if HAVE_SYS_TIME_H
    4945#include <sys/time.h>
    50 #else
     46#endif
    5147#include <time.h>
    52 #endif
    53 #endif
    5448
    5549#ifdef HAVE_DIRENT_H

  • trunk/src/sh_unix.c

    r580 r583  
    5858#endif
    5959
    60 #if TIME_WITH_SYS_TIME
    61 #include <sys/time.h>
    62 #include <time.h>
    63 #else
    6460#if HAVE_SYS_TIME_H
    6561#include <sys/time.h>
    66 #else
     62#endif
    6763#include <time.h>
    68 #endif
    69 #endif
    7064
    7165#ifdef HAVE_SYS_SELECT_H

  • trunk/src/sh_utils.c

    r570 r583  
    2727#include <unistd.h>
    2828
    29 #if TIME_WITH_SYS_TIME
    30 #include <sys/time.h>
    31 #include <time.h>
    32 #else
    3329#if HAVE_SYS_TIME_H
    3430#include <sys/time.h>
    35 #else
     31#endif
    3632#include <time.h>
    37 #endif
    38 #endif
    39 
    4033
    4134#include "samhain.h"

  • trunk/src/sh_xfer_client.c

    r544 r583  
    5959#endif
    6060
    61 #if TIME_WITH_SYS_TIME
    62 #include <sys/time.h>
    63 #include <time.h>
    64 #else
    6561#if HAVE_SYS_TIME_H
    6662#include <sys/time.h>
    67 #else
     63#endif
    6864#include <time.h>
    69 #endif
    70 #endif
    7165
    7266#ifdef HAVE_SYS_SELECT_H

  • trunk/src/sh_xfer_server.c

    r577 r583  
    5959#endif
    6060
    61 #if TIME_WITH_SYS_TIME
    62 #include <sys/time.h>
    63 #include <time.h>
    64 #else
    6561#if HAVE_SYS_TIME_H
    6662#include <sys/time.h>
    67 #else
     63#endif
    6864#include <time.h>
    69 #endif
    70 #endif
    71 
    72 /*
    73 #ifdef TM_IN_SYS_TIME
    74 #include <sys/time.h>
    75 #else
    76 #include <time.h>
    77 #endif
    78 */
    7965
    8066#ifdef HAVE_SYS_SELECT_H

  • trunk/src/sh_xfer_syslog.c

    r541 r583  
    3232#include <netinet/in.h>
    3333
    34 #if TIME_WITH_SYS_TIME
    35 #include <sys/time.h>
    36 #include <time.h>
    37 #else
    3834#if HAVE_SYS_TIME_H
    3935#include <sys/time.h>
    40 #else
     36#endif
    4137#include <time.h>
    42 #endif
    43 #endif
    4438
    4539#include <unistd.h>

  • trunk/src/slib.c

    r568 r583  
    3535#endif
    3636
    37 #if TIME_WITH_SYS_TIME
    38 #include <sys/time.h>
    39 #include <time.h>
    40 #else
    4137#if HAVE_SYS_TIME_H
    4238#include <sys/time.h>
    43 #else
     39#endif
    4440#include <time.h>
    45 #endif
    46 #endif
    4741
    4842#ifdef HAVE_MEMORY_H
Note: See TracChangeset for help on using the changeset viewer.