| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame] | 1 | From 76f5bf3546d826dcbc03acbefcf0b10b972bf136 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 10 Aug 2022 17:19:38 -0700 |
| 4 | Subject: [PATCH 2/2] unix.c: Do not redefine DIR as FILE |
| 5 | |
| 6 | DIR is already provided on Linux via |
| 7 | /usr/include/dirent.h system header |
| 8 | |
| 9 | Upstream-Status: Inactive-Upstream |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | unix/unix.c | 2 -- |
| 13 | 1 file changed, 2 deletions(-) |
| 14 | |
| 15 | diff --git a/unix/unix.c b/unix/unix.c |
| 16 | index ba87614..6e6f4d2 100644 |
| 17 | --- a/unix/unix.c |
| 18 | +++ b/unix/unix.c |
| 19 | @@ -61,13 +61,11 @@ local time_t label_utim = 0; |
| 20 | /* Local functions */ |
| 21 | local char *readd OF((DIR *)); |
| 22 | |
| 23 | - |
| 24 | #ifdef NO_DIR /* for AT&T 3B1 */ |
| 25 | #include <sys/dir.h> |
| 26 | #ifndef dirent |
| 27 | # define dirent direct |
| 28 | #endif |
| 29 | -typedef FILE DIR; |
| 30 | /* |
| 31 | ** Apparently originally by Rich Salz. |
| 32 | ** Cleaned up and modified by James W. Birdsall. |
| 33 | -- |
| 34 | 2.37.1 |
| 35 | |