Gentoo Attachment #92062 for bug #140878

View | Details | Raw Unified
Collapse All | Expand All

(-) umoria/source/main.c (-1 / +5 lines)

Lines 88-93	Link Here

#include <time.h>

#include <time.h>

#endif

#endif

#ifndef __FreeBSD__

#ifndef VMS

#ifndef VMS

#ifndef MAC

#ifndef MAC

#ifndef GEMDOS

#ifndef GEMDOS

Lines 98-103 long time();	Link Here

char *getenv();

char *getenv();

#endif

#endif

#endif

#endif

#else

#include <stdlib.h>

#endif

#ifndef MAC

#ifndef MAC

#ifndef AMIGA

#ifndef AMIGA

Lines 360-366 char *argv[];	Link Here

  else

  else

    {	  /* Create character	   */

    {	  /* Create character	   */

      create_character();

      create_character();

#ifdef MAC

#if defined(MAC) || defined(__FreeBSD__)

      birth_date = time ((time_t *)0);

      birth_date = time ((time_t *)0);

#else

#else

      birth_date = time ((long *)0);

      birth_date = time ((long *)0);

(-) umoria/source/death.c (-2 / +4 lines)

Lines 123-128 static void kingly(void);	Link Here

#include <stdlib.h>

#include <stdlib.h>

#endif

#endif

#ifndef __FreeBSD__

#ifndef VMS

#ifndef VMS

#ifndef MAC

#ifndef MAC

#if !defined(ATARIST_MWC) && !defined(AMIGA)

#if !defined(ATARIST_MWC) && !defined(AMIGA)

Lines 130-147 long time();	Link Here

#endif

#endif

#endif

#endif

#endif

#endif

#endif

static void date(day)

static void date(day)

char *day;

char *day;

  register char *tmp;

  register char *tmp;

#ifdef MAC

#if defined(MAC) || defined(__FreeBSD__)

  time_t clockvar;

  time_t clockvar;

#else

#else

  long clockvar;

  long clockvar;

#endif

#endif

#ifdef MAC

#if defined(MAC) || defined(__FreeBSD__)

  clockvar = time((time_t *) 0);

  clockvar = time((time_t *) 0);

#else

#else

  clockvar = time((long *) 0);

  clockvar = time((long *) 0);

(-) umoria/source/io.c (-3 / +10 lines)

Lines 13-18	Link Here

#include "config.h"

#include "config.h"

#ifdef __FreeBSD__

#include <sys/ioctl_compat.h>

#include <time.h>

#endif

#ifdef HPUX

#ifdef HPUX

#include <sys/bsdtty.h>

#include <sys/bsdtty.h>

#endif

#endif

Lines 245-251 int suspend()	Link Here

  struct ltchars lcbuf;

  struct ltchars lcbuf;

  struct tchars cbuf;

  struct tchars cbuf;

  int lbuf;

  int lbuf;

#ifndef __FreeBSD__

  long time();

  long time();

#endif

  py.misc.male |= 2;

  py.misc.male |= 2;

  (void) ioctl(0, TIOCGETP, (char *)&tbuf);

  (void) ioctl(0, TIOCGETP, (char *)&tbuf);

Lines 313-319 void init_curses()	Link Here

#endif

#endif

  /* PC curses returns ERR */

  /* PC curses returns ERR */

#if defined(USG) && !defined(PC_CURSES) && !defined(AMIGA)

#if (defined(USG) && !defined(PC_CURSES) && !defined(AMIGA)) || defined(__FreeBSD__)

  if (initscr() == NULL)

  if (initscr() == NULL)

#else

#else

  if (initscr() == ERR)

  if (initscr() == ERR)

Lines 331-337 void init_curses()	Link Here

#if defined(atarist) && defined(__GNUC__)

#if defined(atarist) && defined(__GNUC__)

  (void) signal (SIGTSTP, (__Sigfunc)suspend);

  (void) signal (SIGTSTP, (__Sigfunc)suspend);

#else

#else

#ifdef  __386BSD__

#if defined(__386BSD__) || defined(__FreeBSD__)

  (void) signal (SIGTSTP, (sig_t)suspend);

  (void) signal (SIGTSTP, (sig_t)suspend);

#else

#else

  (void) signal (SIGTSTP, suspend);

  (void) signal (SIGTSTP, suspend);

Lines 757-763 void shell_out()	Link Here

      msg_print("Fork failed. Try again.");

      msg_print("Fork failed. Try again.");

      return;

      return;

#if defined(USG) || defined(__386BSD__)

#if defined(USG) || defined(__386BSD__) || defined(__FreeBSD__)

  (void) wait((int *) 0);

  (void) wait((int *) 0);

#else

#else

  (void) wait((union wait *) 0);

  (void) wait((union wait *) 0);

(-) umoria/source/misc1.c (-3 / +7 lines)

Lines 28-34	Link Here

#endif

#endif

#endif

#endif

#if !defined(ATARIST_MWC) && !defined(MAC) && !defined(VMS) && !defined(AMIGA)

#if !defined(ATARIST_MWC) && !defined(MAC) && !defined(VMS) && !defined(AMIGA) && !defined(__FreeBSD__)

long time();

long time();

#endif

#endif

struct tm *localtime();

struct tm *localtime();

Lines 45-51 int32u seed;	Link Here

  register int32u clock_var;

  register int32u clock_var;

  if (seed == 0)

  if (seed == 0)

#ifdef MAC

#if defined(MAC) || defined(__FreeBSD__)

    clock_var = time((time_t *)0);

    clock_var = time((time_t *)0);

#else

#else

    clock_var = time((long *)0);

    clock_var = time((long *)0);

Lines 89-98 void reset_seed()	Link Here

int check_time()

int check_time()

#ifdef MORIA_HOU

#ifdef MORIA_HOU

#if defined(MAC) || defined(__FreeBSD__)

  time_t clock_var;

#else

  long clock_var;

  long clock_var;

#endif

  register struct tm *tp;

  register struct tm *tp;

#ifdef MAC

#if defined(MAC) || defined(__FreeBSD__)

  clock_var = time((time_t *)0);

  clock_var = time((time_t *)0);

#else

#else

  clock_var = time((long *)0);

  clock_var = time((long *)0);

(-) umoria/source/save.c (-4 / +4 lines)

Lines 102-108 static void rd_monster();	Link Here

#endif

#endif

#if !defined(ATARIST_MWC)

#if !defined(ATARIST_MWC)

#ifdef MAC

#if defined(MAC) || defined(__FreeBSD__)

#include <time.h>

#include <time.h>

#else

#else

long time();

long time();

Lines 331-337 static int sv_write()	Link Here

  /* save the current time in the savefile */

  /* save the current time in the savefile */

#ifdef MAC

#if defined(MAC) || defined(__FreeBSD__)

  l = time((time_t *)0);

  l = time((time_t *)0);

#else

#else

  l = time((long *)0);

  l = time((long *)0);

Lines 1029-1035 int *generate;	Link Here

	      || (version_min == 2 && patch_level >= 2))

	      || (version_min == 2 && patch_level >= 2))

	    rd_long ((int32u *)&birth_date);

	    rd_long ((int32u *)&birth_date);

	  else

	  else

#ifdef MAC

#if defined(MAC) || defined(__FreeBSD__)

	    birth_date = time((time_t *)0);

	    birth_date = time((time_t *)0);

#else

#else

	    birth_date = time((long *)0);

	    birth_date = time((long *)0);

Lines 1253-1259 scoreboard; it will not be scored again.	Link Here

	      /* rotate store inventory, depending on how old the save file */

	      /* rotate store inventory, depending on how old the save file */

	      /* is foreach day old (rounded up), call store_maint */

	      /* is foreach day old (rounded up), call store_maint */

	      /* calculate age in seconds */

	      /* calculate age in seconds */

#ifdef MAC

#if defined(MAC) || defined(__FreeBSD__)

	      start_time = time((time_t *)0);

	      start_time = time((time_t *)0);

#else

#else

	      start_time = time((long *)0);

	      start_time = time((long *)0);

(-) umoria/source/signals.c (-2 / +2 lines)

Lines 89-95 static int signal_count = 0;	Link Here

/*ARGSUSED*/

/*ARGSUSED*/

#ifndef USG

#ifndef USG

#ifdef __386BSD__

#if defined(__386BSD__) || defined(__FreeBSD__)

static void signal_handler(sig, code, scp)

static void signal_handler(sig, code, scp)

#else

#else

static int signal_handler(sig, code, scp)

static int signal_handler(sig, code, scp)

Lines 217-223 void signals()	Link Here

#if defined(atarist) && defined(__GNUC__)

#if defined(atarist) && defined(__GNUC__)

  (void) signal(SIGTSTP, (__Sigfunc)suspend);

  (void) signal(SIGTSTP, (__Sigfunc)suspend);

#else

#else

#ifdef  __386BSD__

#if defined(__386BSD__) || defined(__FreeBSD__)

  (void) signal(SIGTSTP, (sig_t)suspend);

  (void) signal(SIGTSTP, (sig_t)suspend);

#else

#else

  (void) signal(SIGTSTP, suspend);

  (void) signal(SIGTSTP, suspend);

(-) umoria/source/types.h (+9 lines)

Lines 6-16	Link Here

   not for profit purposes provided that this copyright and statement are

   not for profit purposes provided that this copyright and statement are

   included in all such copies. */

   included in all such copies. */

#ifdef __FreeBSD__

#include <sys/types.h>

typedef u_int32_t int32u;

typedef int32_t   int32;

typedef u_int16_t int16u;

typedef int16_t   int16;

typedef u_int8_t  int8u;

#else

typedef unsigned long  int32u;

typedef unsigned long  int32u;

typedef long	       int32;

typedef long	       int32;

typedef unsigned short int16u;

typedef unsigned short int16u;

typedef short	       int16;

typedef short	       int16;

typedef unsigned char  int8u;

typedef unsigned char  int8u;

#endif

/* some machines will not accept 'signed char' as a type, and some accept it

/* some machines will not accept 'signed char' as a type, and some accept it

   but still treat it like an unsigned character, let's just avoid it,

   but still treat it like an unsigned character, let's just avoid it,

   any variable which can ever hold a negative value must be 16 or 32 bits */

   any variable which can ever hold a negative value must be 16 or 32 bits */

(-) umoria/unix/unix.c (+6 lines)

Lines 14-19	Link Here

/* defines TRUE and FALSE */

/* defines TRUE and FALSE */

#include <curses.h>

#include <curses.h>

#ifdef __FreeBSD__

#include <unistd.h>

#endif

#include "config.h"

#include "config.h"

#include "constant.h"

#include "constant.h"

#include "types.h"

#include "types.h"

Lines 276-282 int getuid();	Link Here

void user_name(buf)

void user_name(buf)

char *buf;

char *buf;

#ifndef __FreeBSD__

  extern char *getlogin();

  extern char *getlogin();

#endif

  struct passwd *pwline;

  struct passwd *pwline;

  register char *p;

  register char *p;

Attachment #92062: 5.5.2-fbsd.patch for bug #140878