1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

- Fixed build under clang, no other changes.

This commit is contained in:
Diane Bruce 2011-08-06 01:57:09 +00:00
parent 0d15ccba07
commit becc5c15ae
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=278987
9 changed files with 215 additions and 0 deletions

View File

@ -0,0 +1,20 @@
--- dcf77/dcfdemod.c.orig 2011-08-05 11:39:38.000000000 -0400
+++ dcf77/dcfdemod.c 2011-08-05 12:02:16.000000000 -0400
@@ -91,7 +91,7 @@
/* --------------------------------------------------------------------- */
-extern __inline__ void decode_ampl_bit(unsigned int bit, unsigned int samples)
+__inline__ void decode_ampl_bit(unsigned int bit, unsigned int samples)
{
if (bit == 0) {
if (d.t.dcnt >= 59)
@@ -109,7 +109,7 @@
/* --------------------------------------------------------------------- */
-extern __inline__ void dcf77_process_ampl(int si, unsigned int samples)
+__inline__ void dcf77_process_ampl(int si, unsigned int samples)
{
static int rodcnt = 0;
char* rod = "|/-\\ ";

View File

@ -0,0 +1,20 @@
--- dcf77/dcfdemodpn.c.orig 2011-08-05 12:03:43.000000000 -0400
+++ dcf77/dcfdemodpn.c 2011-08-05 12:13:40.000000000 -0400
@@ -132,7 +132,7 @@
#define PN_TRKTAU (PN_SEQINC/3)
#define PN_TRKADJ (PN_SEQINC/8)
-extern __inline__ void trk_sample(int sq, unsigned int samples)
+__inline__ void trk_sample(int sq, unsigned int samples)
{
if (d.d.sec_ph > 0x3fffffff) {
trk_init();
@@ -201,7 +201,7 @@
/* --------------------------------------------------------------------- */
-extern __inline__ void srch_sample(int sq)
+__inline__ void srch_sample(int sq)
{
unsigned int u, k;
int asq = abs(sq);

View File

@ -0,0 +1,11 @@
--- dcf77/hbgdemod.c.orig 2011-08-05 12:15:27.000000000 -0400
+++ dcf77/hbgdemod.c 2011-08-05 12:15:37.000000000 -0400
@@ -109,7 +109,7 @@
/* --------------------------------------------------------------------- */
-extern __inline__ void hbg_process_ampl(int si, unsigned int samples)
+__inline__ void hbg_process_ampl(int si, unsigned int samples)
{
static int rodcnt = 0;
char* rod = "|/-\\ ";

View File

@ -0,0 +1,29 @@
--- hfkernel/fsk/fskinlines.h.orig 2011-08-05 10:56:43.000000000 -0400
+++ hfkernel/fsk/fskinlines.h 2011-08-05 11:00:59.000000000 -0400
@@ -84,7 +84,7 @@
/* --------------------------------------------------------------------- */
-extern __inline__ unsigned int cc_replace(void)
+__inline__ unsigned int cc_replace(void)
{
unsigned int j, k = CORRELATOR_CACHE;
int l = -1;
@@ -175,7 +175,7 @@
/* --------------------------------------------------------------------- */
-extern __inline__ l1_soft_t do_filter(struct l1rxslots *slot, short *s)
+__inline__ l1_soft_t do_filter(struct l1rxslots *slot, short *s)
{
unsigned int cc = slot->corr_cache;
@@ -319,7 +319,7 @@
/* --------------------------------------------------------------------- */
-extern __inline__ l1_soft_t do_filter(struct l1rxslots *slot, short *s)
+ __inline__ l1_soft_t do_filter(struct l1rxslots *slot, short *s)
{
unsigned int cc = slot->corr_cache;

View File

@ -0,0 +1,11 @@
--- hfkernel/fsk/fskl1.c.orig 2011-08-05 10:57:44.000000000 -0400
+++ hfkernel/fsk/fskl1.c 2011-08-05 10:58:19.000000000 -0400
@@ -376,7 +376,7 @@
/* --------------------------------------------------------------------- */
-extern __inline__ unsigned int output_one_sample(l1_time_t tm)
+__inline__ unsigned int output_one_sample(l1_time_t tm)
{
int i, j, k;

View File

@ -0,0 +1,11 @@
--- hfkernel/fsk/gtor.c.orig 2011-08-05 09:19:37.000000000 -0400
+++ hfkernel/fsk/gtor.c 2011-08-05 10:51:40.000000000 -0400
@@ -780,7 +780,7 @@
/* --------------------------------------------------------------------- */
-extern __inline__ void soft_deinterleave(const int *inp, unsigned short *out,
+__inline__ void soft_deinterleave(const int *inp, unsigned short *out,
unsigned int ntrib, unsigned int spacing, int inv)
{
unsigned int invm = inv ? 0 : ~0;

View File

@ -0,0 +1,91 @@
--- hfkernel/fsk/pactor.c.orig 2011-08-05 09:15:15.000000000 -0400
+++ hfkernel/fsk/pactor.c 2011-08-05 09:15:55.000000000 -0400
@@ -256,7 +256,7 @@
/* --------------------------------------------------------------------- */
-extern __inline__ unsigned int get_crc_preset(int pktlen)
+__inline__ unsigned int get_crc_preset(int pktlen)
{
switch (pktlen) {
case 23:
@@ -280,7 +280,7 @@
#define PKT_QRT (1<<2)
#define PKT_IDLE (1<<3)
-extern __inline__ void decode_qrt_packet(unsigned char *data, int pktlen)
+__inline__ void decode_qrt_packet(unsigned char *data, int pktlen)
{
unsigned char buf[8];
unsigned char *bp2;
@@ -456,7 +456,7 @@
};
-extern __inline__ void encode_qrt_packet(int pktlen)
+__inline__ void encode_qrt_packet(int pktlen)
{
unsigned char *p1, *p2;
unsigned int crc;
@@ -611,7 +611,7 @@
#define TMSIZE (sizeof(ps.tm.devflt)/sizeof(ps.tm.devflt[0]))
-extern __inline__ void tmg_clear(void)
+__inline__ void tmg_clear(void)
{
memset(ps.tm.devflt, 0, sizeof(ps.tm.devflt));
ps.tm.ptr = 0;
@@ -646,7 +646,7 @@
/* --------------------------------------------------------------------- */
-extern __inline__ void marq_clear(void)
+__inline__ void marq_clear(void)
{
memset(ps.marq.acc, 0, sizeof(ps.marq.acc));
ps.marq.hdr = 0xff;
@@ -657,7 +657,7 @@
* misc utility functions
*/
-extern __inline__ void cycle_end(void)
+__inline__ void cycle_end(void)
{
ps.rxtime += PACTOR_CYCLE_ARQ;
ps.txtime += PACTOR_CYCLE_ARQ;
@@ -665,14 +665,14 @@
ps.txinv = !ps.txinv;
}
-extern __inline__ void ack_transmit(void)
+__inline__ void ack_transmit(void)
{
kbd_ack();
ps.pkt_counter = (ps.pkt_counter + 1) & 3;
ps.cur_hdr ^= 0xff;
}
-extern __inline__ int retry(void)
+__inline__ int retry(void)
{
if ((--ps.retry) <= 0)
return 1;
@@ -680,7 +680,7 @@
}
#ifdef FREQ_TRACKING
-extern __inline__ void pct_freq_tracking(int trk, l1_soft_t trkl, l1_soft_t trkm, l1_soft_t trkh)
+__inline__ void pct_freq_tracking(int trk, l1_soft_t trkl, l1_soft_t trkm, l1_soft_t trkh)
{
ps.rxfreqdev += trk;
if (!ps.is_master)
@@ -1534,7 +1534,7 @@
/* --------------------------------------------------------------------- */
-extern __inline__ void guess_crc(unsigned char *pkt, unsigned int len)
+__inline__ void guess_crc(unsigned char *pkt, unsigned int len)
{
#ifdef STANDBY_CRC_PRINT
unsigned char buf[24];

View File

@ -0,0 +1,11 @@
--- util/channel.c.orig 2011-08-05 12:18:02.000000000 -0400
+++ util/channel.c 2011-08-05 12:18:21.000000000 -0400
@@ -217,7 +217,7 @@
* with nrand = 16 and randommax = 0x1000
*/
-extern __inline__ float randn(void)
+__inline__ float randn(void)
{
int sum = 0, i;

View File

@ -0,0 +1,11 @@
--- util/testgaussgen.c.orig 2011-08-05 12:28:30.000000000 -0400
+++ util/testgaussgen.c 2011-08-05 12:31:35.000000000 -0400
@@ -72,7 +72,7 @@
* with nrand = 16 and randommax = 0x1000
*/
-extern __inline__ float randn(void)
+__inline__ float randn(void)
{
int sum = 0, i;