head	1.5;
access;
symbols
	RELEASE_8_3_0:1.5
	RELEASE_9_0_0:1.5
	RELEASE_7_4_0:1.5
	RELEASE_8_2_0:1.5
	RELEASE_6_EOL:1.5
	RELEASE_8_1_0:1.5
	RELEASE_7_3_0:1.5
	RELEASE_8_0_0:1.5
	RELEASE_7_2_0:1.5
	RELEASE_7_1_0:1.5
	RELEASE_6_4_0:1.5
	RELEASE_5_EOL:1.5
	RELEASE_7_0_0:1.5
	RELEASE_6_3_0:1.5
	PRE_XORG_7:1.5
	RELEASE_4_EOL:1.5
	RELEASE_6_2_0:1.5
	RELEASE_6_1_0:1.5
	RELEASE_5_5_0:1.5
	RELEASE_6_0_0:1.5
	RELEASE_5_4_0:1.5
	RELEASE_4_11_0:1.5
	RELEASE_5_3_0:1.5
	RELEASE_4_10_0:1.5
	RELEASE_5_2_1:1.5
	RELEASE_5_2_0:1.5
	RELEASE_4_9_0:1.5
	RELEASE_5_1_0:1.5
	RELEASE_4_8_0:1.5
	RELEASE_5_0_0:1.5
	RELEASE_4_7_0:1.5
	RELEASE_4_6_2:1.5
	RELEASE_4_6_1:1.5
	RELEASE_4_6_0:1.5
	RELEASE_5_0_DP1:1.5
	RELEASE_4_5_0:1.5
	RELEASE_4_4_0:1.5
	RELEASE_4_3_0:1.5
	RELEASE_4_2_0:1.5
	RELEASE_4_1_1:1.5
	RELEASE_4_1_0:1.5
	RELEASE_3_5_0:1.5
	RELEASE_4_0_0:1.5
	RELEASE_3_4_0:1.5
	RELEASE_3_3_0:1.5
	RELEASE_3_2_0:1.5
	RELEASE_3_1_0:1.4
	RELEASE_2_2_8:1.3
	RELEASE_3_0_0:1.3
	RELEASE_2_2_7:1.3
	RELEASE_2_2_6:1.3
	RELEASE_2_2_5:1.3
	RELEASE_2_2_1:1.2
	RELEASE_2_2_2:1.3
	ache:1.1.1.1;
locks; strict;
comment	@# @;


1.5
date	99.02.17.22.25.40;	author ache;	state Exp;
branches;
next	1.4;

1.4
date	99.01.03.07.59.26;	author simokawa;	state Exp;
branches;
next	1.3;

1.3
date	97.04.24.02.14.01;	author asami;	state Exp;
branches;
next	1.2;

1.2
date	97.02.16.21.10.58;	author obrien;	state Exp;
branches;
next	1.1;

1.1
date	94.12.28.01.55.03;	author ache;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	94.12.28.01.55.04;	author ache;	state Exp;
branches;
next	;


desc
@@


1.5
log
@upgrade to 2.43
@
text
@--- unarj.h.orig	Mon Sep 29 14:00:24 1997
+++ unarj.h	Thu Feb 18 01:06:10 1999
@@@@ -106,8 +106,12 @@@@
 #endif
 
 typedef unsigned char  uchar;   /*  8 bits or more */
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
 typedef unsigned int   uint;    /* 16 - 32 bits or more */
 typedef unsigned short ushort;  /* 16 bits or more */
+#else
+#  include <sys/types.h>
+#endif
 typedef unsigned long  ulong;   /* 32 bits or more */
 
 #define USHRT_BIT   (CHAR_BIT * sizeof(ushort))
@


1.4
log
@- fix time_t conflicts on alpha
- split up patches into one source file per patch file.
Obtained from: NetBSD (with a litte modification by me)
@
text
@d1 3
a3 3
--- unarj.h.orig	Wed Jun 23 06:07:20 1993
+++ unarj.h	Wed Jan 21 15:03:39 1998
@@@@ -104,9 +104,13 @@@@
a15 1
 
@


1.3
log
@#include <sys/types.h> for "uint" and stuff.
@
text
@d1 16
a16 84
*** Makefile.old	Wed Jul 17 22:02:20 1991
--- Makefile	Wed Dec 28 04:39:21 1994
***************
*** 1,5 ****
! 
! CC=cc 
  
  all:	      unarj
  
--- 1,4 ----
! CFLAGS+=-DUNIX
  
  all:	      unarj
  
*** environ.c.old	Wed Jun 23 09:07:20 1993
--- environ.c	Wed Dec 28 04:38:04 1994
***************
*** 534,541 ****
  }
  
  long
! gettz()         /* returns the offset from GMT in seconds */
  {
  #define NOONOFFSET    43200L
  #define SEC_IN_DAY    (24L * 60L * 60L)
  #define INV_VALUE     (SEC_IN_DAY + 1L)
--- 534,545 ----
  }
  
  long
! gettz(stamp)         /* returns the offset from GMT in seconds */
! time_t stamp;
  {
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ 	return -localtime(&stamp)->tm_gmtoff;
+ #else
  #define NOONOFFSET    43200L
  #define SEC_IN_DAY    (24L * 60L * 60L)
  #define INV_VALUE     (SEC_IN_DAY + 1L)
***************
*** 551,556 ****
--- 555,561 ----
      noontm = localtime(&noon);
      retval = NOONOFFSET - 60 * (60 * noontm->tm_hour - noontm->tm_min);
      return retval;
+ #endif
  }
  
  long
***************
*** 608,614 ****
      (uint) attribute;
      (uint) host;
  
!     m_time = mstonix(tstamp) + gettz();
  
      tb.mtime = m_time;                  /* Set modification time */
      tb.atime = m_time;                  /* Set access time */
--- 613,620 ----
      (uint) attribute;
      (uint) host;
  
!     m_time = mstonix(tstamp);
!     m_time += gettz(m_time);
  
      tb.mtime = m_time;                  /* Set modification time */
      tb.atime = m_time;                  /* Set access time */
*** unarj.h.old	Wed Jun 23 09:07:20 1993
--- unarj.h	Wed Dec 28 04:25:07 1994
***************
*** 104,111 ****
--- 104,115 ----
  #endif
  
  typedef unsigned char  uchar;   /*  8 bits or more */
+ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
  typedef unsigned int   uint;    /* 16 - 32 bits or more */
  typedef unsigned short ushort;  /* 16 bits or more */
+ #else
+ #  include <sys/types.h>
+ #endif
  typedef unsigned long  ulong;   /* 32 bits or more */
  
  #define USHRT_BIT   (CHAR_BIT * sizeof(ushort))
@


1.2
log
@A quick purousal thru our port's patches directory shows a *WAY* over use of
__FreeBSD__.

That said, add __OpenBSD__ and __NetBSD__ where approapiate.
@
text
@d72 1
a72 1
--- 104,113 ----
d79 2
@


1.1
log
@Initial revision
@
text
@d34 1
a34 1
+ #ifdef __FreeBSD__
d76 1
a76 1
+ #ifndef __FreeBSD__
@


1.1.1.1
log
@arj dearchiver
@
text
@@
