cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix time_t conflicts on alpha

Browse Source 
- split up patches into one source file per patch file.
Obtained from: NetBSD (with a litte modification by me)
This commit is contained in:
Hidetoshi Shimokawa 1999-01-03 07:59:26 +00:00
parent f4d81f16ef
commit 5757ac47cb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=15795
2 changed files with 77 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
archivers/unarj/files/patch-aa
View File

@ -1,84 +1,16 @@
*** 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))
--- unarj.h.orig Wed Jun 23 06:07:20 1993
+++ unarj.h Wed Jan 21 15:03:39 1998
@@ -104,9 +104,13 @@
#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))

61
archivers/unarj/files/patch-ac Normal file
View File

@ -0,0 +1,61 @@
--- environ.c.orig Tue Jun 22 22:07:20 1993
+++ environ.c Sat Dec 26 08:39:07 1998
@@ -429,16 +429,23 @@
#define SUBS_DEFINED
+#include <stdlib.h>
+#include <string.h>
#include <time.h>
+#include <sys/types.h>
-#ifndef time_t
-#define time_t long
-#endif
+/*#ifndef time_t
+ #define time_t long
+ #endif*/
+
+#include <sys/param.h>
+#if !(defined(BSD) && BSD >= 199306)
extern struct tm *localtime();
extern time_t time();
extern char *strcpy();
extern voidp *malloc();
+#endif
FILE *
file_open(name, mode)
@@ -534,8 +541,12 @@
}
long
-gettz() /* returns the offset from GMT in seconds */
+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,6 +562,7 @@
noontm = localtime(&noon);
retval = NOONOFFSET - 60 * (60 * noontm->tm_hour - noontm->tm_min);
return retval;
+#endif
}
long
@@ -608,7 +620,8 @@
(uint) attribute;
(uint) host;
- m_time = mstonix(tstamp) + gettz();
+ m_time = mstonix(tstamp);
+ m_time += gettz(m_time);
tb.mtime = m_time; /* Set modification time */
tb.atime = m_time; /* Set access time */