mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 09:36:41 -04:00
06c5005b27
This is one of three ports still explicitly dependent on lang/gcc48. The problems that were preventing the upgrade were as follows: - The __OUT*/__IN* macros in io.h were declaring the produced functions as extern, yielding multiple "definitions." They're inline asm, so just give them static linkage. - reboot was declared inline with non-static linkage, thus leaving it in a weird state where it wasn't visible within the same CU or another CU. Drop the inline for now; if it really needs to be inlined, it can be moved into a header and declared `static inline`. I made these changes, then discovered there's a 5.31b that's still in testing. I checked the archive for that and was delighted to discover these changes had already actually been made there, too, so let's consider this a backport. PR: 253303 Approved by: avg (maintainer) MFH: 2021Q1
18 lines
337 B
C
18 lines
337 B
C
--- lib.c.orig 2021-02-06 17:28:48 UTC
|
|
+++ lib.c
|
|
@@ -33,7 +33,7 @@ struct ascii_map_str {
|
|
int keycode;
|
|
};
|
|
|
|
-inline void reboot(void)
|
|
+void reboot(void)
|
|
{
|
|
|
|
/* tell the BIOS to do a cold start */
|
|
@@ -1196,4 +1196,4 @@ void get_list(int x, int y, int len, char *buf)
|
|
return;
|
|
}
|
|
}
|
|
-}
|
|
\ No newline at end of file
|
|
+}
|