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

Fix comms/mgetty+sendfax for gcc architectures.

Browse Source 
patches for g3/* added static before the "#ifdef __GNUC__" but on
GCC architectures that ended up having "static static inline".
Move the statics outside the ifdef

ok cwen@
This commit is contained in:
kmos 2020-01-08 22:22:39 +00:00
parent 2884026fd9
commit 5b19b89056
2 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
comms/mgetty+sendfax/patches/patch-g3_g3cat_c
View File

@ -1,36 +1,48 @@
$OpenBSD: patch-g3_g3cat_c,v 1.2 2019/10/14 21:05:07 jcs Exp $
$OpenBSD: patch-g3_g3cat_c,v 1.3 2020/01/08 22:22:39 kmos Exp $
Index: g3/g3cat.c
--- g3/g3cat.c.orig
+++ g3/g3cat.c
@@ -60,6 +60,7 @@ static int padding = 0; /* default: no padding done
@@ -60,8 +60,9 @@ static int padding = 0; /* default: no padding done
static int b_written = 0; /* bytes of a line already */
/* written */
+static
#ifdef __GNUC__
static inline
-static inline
+inline
#endif
@@ -83,6 +84,7 @@ void putcode _P2( (code, len), int code, int len )
void putcode _P2( (code, len), int code, int len )
{
@@ -83,8 +84,9 @@ void putcode _P2( (code, len), int code, int len )
}
}
+static
#ifdef __GNUC__
static inline
-static inline
+inline
#endif
@@ -114,6 +116,7 @@ void putwhitespan _P1( (l), int l )
void putwhitespan _P1( (l), int l )
{
@@ -114,8 +116,9 @@ void putwhitespan _P1( (l), int l )
putcode( t_white[l].bit_code, t_white[l].bit_length );
}
+static
#ifdef __GNUC__
static inline
-static inline
+inline
#endif
@@ -145,6 +148,7 @@ void putblackspan _P1( (l), int l )
void putblackspan _P1( (l), int l )
{
@@ -145,8 +148,9 @@ void putblackspan _P1( (l), int l )
putcode( t_black[l].bit_code, t_black[l].bit_length );
}
+static
#ifdef __GNUC__
static inline
-static inline
+inline
#endif
void puteol _P0( void ) /* write byte-aligned EOL */
{

30
comms/mgetty+sendfax/patches/patch-g3_pbm2g3_c
View File

@ -1,36 +1,48 @@
$OpenBSD: patch-g3_pbm2g3_c,v 1.2 2019/10/14 21:05:07 jcs Exp $
$OpenBSD: patch-g3_pbm2g3_c,v 1.3 2020/01/08 22:22:39 kmos Exp $
Index: g3/pbm2g3.c
--- g3/pbm2g3.c.orig
+++ g3/pbm2g3.c
@@ -39,6 +39,7 @@ static unsigned int out_hibit = 0;
@@ -39,8 +39,9 @@ static unsigned int out_hibit = 0;
static int out_byte_tab[ 256 ]; /* for g3 byte reversal */
+static
#ifdef __GNUC__
static inline
-static inline
+inline
#endif
@@ -59,6 +60,7 @@ void putcode _P2( (code, len), int code, int len )
void putcode _P2( (code, len), int code, int len )
{
@@ -59,8 +60,9 @@ void putcode _P2( (code, len), int code, int len )
}
}
+static
#ifdef __GNUC__
static inline
-static inline
+inline
#endif
@@ -68,6 +70,7 @@ void puteol _P0( void ) /* write byte-aligned EOL */
void puteol _P0( void ) /* write byte-aligned EOL */
{
@@ -68,8 +70,9 @@ void puteol _P0( void ) /* write byte-aligned EOL */
putcode( 0x800, 12 );
}
+static
#ifdef __GNUC__
static inline
-static inline
+inline
#endif
@@ -99,6 +102,7 @@ void putwhitespan _P1( (l), int l )
void putwhitespan _P1( (l), int l )
{
@@ -99,8 +102,9 @@ void putwhitespan _P1( (l), int l )
putcode( t_white[l].bit_code, t_white[l].bit_length );
}
+static
#ifdef __GNUC__
static inline
-static inline
+inline
#endif
void putblackspan _P1( (l), int l )
{