1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
|
Description: Defines FreeBSD for kFreeBSD systems, also makes sure kfreeBSD is set to use FHS
#grep -r -H "__FreeBSD" . -m 1 --exclude=*.patch --exclude-dir=.git | cut -d: -f1 | xargs sed -i s/__FreeBSD__/__FreeBSD_kernel__/
#grep -r -H "ifdef __linux__" . -m 1 --exclude=*.patch --exclude-dir=.git | cut -d: -f1 | xargs sed -i s/'#ifdef __linux__'/'#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)'/
#grep -r -H "ifndef __linux__" . -m 1 --exclude=*.patch --exclude-dir=.git | cut -d: -f1 | xargs sed -i s/'#ifndef __linux__'/'#if !defined(__linux__) \&\& !defined(__GNU__) \&\& !defined(__GLIBC__)'/
Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585089
Author: Scott Howard <showard@debian.org>
Upstream-Status: Pending
Index: rxtx/src/RS485Imp.c
===================================================================
--- rxtx.orig/src/RS485Imp.c 2011-02-23 22:53:43.393378664 -0500
+++ rxtx/src/RS485Imp.c 2011-02-23 22:53:52.663072550 -0500
@@ -120,11 +120,11 @@
threads, because it slows things down. Go figure. */
/* POSIX signal handling functions */
-#if !defined(__FreeBSD___)
+#if !defined(__FreeBSD_kernel___)
struct sigaction handler;
sigaction( SIGIO, NULL, &handler );
if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
-#endif /* !__FreeBSD__ */
+#endif /* !__FreeBSD_kernel__ */
#if defined(__linux__)
/* Lets let people who upgraded kernels know they may have problems */
if (uname (&name) == -1)
@@ -178,7 +178,7 @@
ttyset.c_cc[ VMIN ] = 0;
ttyset.c_cc[ VTIME ] = 0;
-#ifdef __FreeBSD__
+#ifdef __FreeBSD_kernel__
if( cfsetspeed( &ttyset, B9600 ) < 0 ) goto fail;
#else
if( cfsetispeed( &ttyset, B9600 ) < 0 ) goto fail;
@@ -238,7 +238,7 @@
if( !translate_data_bits( env, (int *)&(ttyset.c_cflag), dataBits ) ) return; /* dima c_cflag in darwin is unsigned long */
if( !translate_stop_bits( env, (int *)&(ttyset.c_cflag), stopBits ) ) return; /* dima c_cflag in darwin is unsigned long */
if( !translate_parity( env, (int *)&(ttyset.c_cflag), parity ) ) return;/* dima c_cflag in darwin is unsigned long */
-#ifdef __FreeBSD__
+#ifdef __FreeBSD_kernel__
if( cfsetspeed( &ttyset, cspeed ) < 0 ) goto fail;
#else
if( cfsetispeed( &ttyset, cspeed ) < 0 ) goto fail;
@@ -1290,7 +1290,7 @@
return(JNI_FALSE);
}
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD_kernel__)
if(!strcmp(name,"tty0")|| !strcmp(name,"ttyd")||
!strcmp(name,"ttyq")|| !strcmp(name,"ttym")||
!strcmp(name,"ttyf")|| !strcmp(name,"ttyS")||
Index: rxtx/src/RawImp.c
===================================================================
--- rxtx.orig/src/RawImp.c 2011-02-23 22:53:43.413378002 -0500
+++ rxtx/src/RawImp.c 2011-02-23 22:53:52.663072550 -0500
@@ -265,11 +265,11 @@
threads, because it slows things down. Go figure. */
/* POSIX signal handling functions */
-#if !defined(__FreeBSD___)
+#if !defined(__FreeBSD_kernel___)
struct sigaction handler;
sigaction( SIGIO, NULL, &handler );
if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
-#endif /* !__FreeBSD__ */
+#endif /* !__FreeBSD_kernel__ */
#if defined(__linux__)
/* Lets let people who upgraded kernels know they may have problems */
if (uname (&name) == -1)
@@ -307,7 +307,7 @@
if( !translate_data_bits( env, (int *)&(ttyset.c_cflag), dataBits ) ) return; /* dima c_flag darwin unsigned long */
if( !translate_stop_bits( env, (int *)&(ttyset.c_cflag), stopBits ) ) return; /* dima c_flag darwin unsigned long */
if( !translate_parity( env, (int *)&(ttyset.c_cflag), parity ) ) return;/* dima c_flag darwin unsigned long */
-#ifdef __FreeBSD__
+#ifdef __FreeBSD_kernel__
if( cfsetspeed( &ttyset, cspeed ) < 0 ) goto fail;
#else
if( cfsetispeed( &ttyset, cspeed ) < 0 ) goto fail;
@@ -1289,7 +1289,7 @@
return(JNI_FALSE);
}
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD_kernel__)
if(!strcmp(name,"tty0")|| !strcmp(name,"ttyd")||
!strcmp(name,"ttyq")|| !strcmp(name,"ttym")||
!strcmp(name,"ttyf")|| !strcmp(name,"ttyS")||
Index: rxtx/src/SerialImp.h
===================================================================
--- rxtx.orig/src/SerialImp.h 2011-02-23 22:53:43.423377671 -0500
+++ rxtx/src/SerialImp.h 2011-02-23 22:55:45.573475048 -0500
@@ -97,7 +97,7 @@
/* glue for unsupported linux speeds see also win32termios.h */
-#if !defined(__APPLE__) && !defined(__FreeBSD__) /* dima */
+#if !defined(__APPLE__) && !defined(__FreeBSD_kernel__) /* dima */
/* this is now handled in SerialImp.c
#define B14400 1010001
#define B28800 1010002
@@ -147,7 +147,7 @@
};
/* Ports known on the OS */
-#if defined(__linux__)
+#if defined(__linux__) || defined(__FreeBSD_kernel__)
/*
This is a small hack to get mark and space parity working on older systems
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=147533
Index: rxtx/src/SerialImp.c
===================================================================
--- rxtx.orig/src/SerialImp.c 2011-02-23 22:53:43.443377009 -0500
+++ rxtx/src/SerialImp.c 2011-02-23 22:53:52.663072550 -0500
@@ -423,7 +423,7 @@
ttyset.c_cc[ VMIN ] = 0;
ttyset.c_cc[ VTIME ] = 0;
-#ifdef __FreeBSD__
+#ifdef __FreeBSD_kernel__
if( cfsetspeed( &ttyset, B9600 ) < 0 ) goto fail;
#else
if( cfsetispeed( &ttyset, B9600 ) < 0 ) goto fail;
@@ -844,13 +844,13 @@
return(1);
}
-#ifdef __FreeBSD__
+#ifdef __FreeBSD_kernel__
if( cfsetspeed( &ttyset, cspeed ) < 0 )
{
report( "set_port_params: Cannot Set Speed\n" );
return( 1 );
}
-#endif /* __FreeBSD__ */
+#endif /* __FreeBSD_kernel__ */
if( !cspeed )
{
/* hang up the modem aka drop DTR */
@@ -4705,7 +4705,7 @@
stat(teststring,&mystat);
#endif /* __sun__ */
/* XXX the following hoses freebsd when it tries to open the port later on */
-#ifndef __FreeBSD__
+#ifndef __FreeBSD_kernel__
if(S_ISCHR(mystat.st_mode)){
fd=OPEN(teststring,O_RDONLY|O_NONBLOCK);
if (fd>0){
Index: rxtx/src/ParallelImp.c
===================================================================
--- rxtx.orig/src/ParallelImp.c 2011-02-23 22:53:43.463376347 -0500
+++ rxtx/src/ParallelImp.c 2011-02-23 22:53:52.663072550 -0500
@@ -111,7 +111,7 @@
#if defined(__linux__)
# include <linux/lp.h>
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD_kernel__)
/* # include <machine/lpt.h> ? is this changed or wrong */
# include <dev/ppbus/lpt.h>
#endif
@@ -265,7 +265,7 @@
#if defined(__linux__)
return( status & LP_BUSY ? JNI_TRUE : JNI_FALSE );
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD_kernel__)
return( status & EBUSY ? JNI_TRUE : JNI_FALSE );
#endif
return(JNI_FALSE);
@@ -341,7 +341,7 @@
ioctl(fd, LPGETSTATUS, &status);
return( status & LP_BUSY ? JNI_TRUE : JNI_FALSE );
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD_kernel__)
printf("ParallelImp.c LPGETSTATUS not defined\n");
/*
return( status & EBUSY ? JNI_TRUE : JNI_FALSE );
Index: rxtx/src/I2CImp.c
===================================================================
--- rxtx.orig/src/I2CImp.c 2011-02-23 22:53:43.483375685 -0500
+++ rxtx/src/I2CImp.c 2011-02-23 22:53:52.663072550 -0500
@@ -120,11 +120,11 @@
threads, because it slows things down. Go figure. */
/* POSIX signal handling functions */
-#if !defined(__FreeBSD___)
+#if !defined(__FreeBSD_kernel___)
struct sigaction handler;
sigaction( SIGIO, NULL, &handler );
if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
-#endif /* !__FreeBSD__ */
+#endif /* !__FreeBSD_kernel__ */
#if defined(__linux__)
/* Lets let people who upgraded kernels know they may have problems */
if (uname (&name) == -1)
@@ -178,7 +178,7 @@
ttyset.c_cc[ VMIN ] = 0;
ttyset.c_cc[ VTIME ] = 0;
-#ifdef __FreeBSD__
+#ifdef __FreeBSD_kernel__
if( cfsetspeed( &ttyset, B9600 ) < 0 ) goto fail;
#else
if( cfsetispeed( &ttyset, B9600 ) < 0 ) goto fail;
@@ -238,7 +238,7 @@
if( !translate_data_bits( env, (int *)&(ttyset.c_cflag), dataBits ) ) return; /* dima darwin defime c_cflag as unsigned long */
if( !translate_stop_bits( env, (int *)&(ttyset.c_cflag), stopBits ) ) return; /* dima darwin defime c_cflag as unsigned long */
if( !translate_parity( env, (int *)&(ttyset.c_cflag), parity ) ) return;/* dima darwin defime c_cflag as unsigned long */
-#ifdef __FreeBSD__
+#ifdef __FreeBSD_kernel__
if( cfsetspeed( &ttyset, cspeed ) < 0 ) goto fail;
#else
if( cfsetispeed( &ttyset, cspeed ) < 0 ) goto fail;
@@ -1220,7 +1220,7 @@
return(JNI_FALSE);
}
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD_kernel__)
if(!strcmp(name,"tty0")|| !strcmp(name,"ttyd")||
!strcmp(name,"ttyq")|| !strcmp(name,"ttym")||
!strcmp(name,"ttyf")|| !strcmp(name,"ttyS")||
Index: rxtx/src/SerialImp.cpp
===================================================================
--- rxtx.orig/src/SerialImp.cpp 2011-02-23 22:53:43.503375023 -0500
+++ rxtx/src/SerialImp.cpp 2011-02-23 22:53:52.663072550 -0500
@@ -135,11 +135,11 @@
threads, because it slows things down. Go figure. */
/* POSIX signal handling functions */
-#if !defined(__FreeBSD___)
+#if !defined(__FreeBSD_kernel___)
struct sigaction handler;
sigaction( SIGIO, NULL, &handler );
if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
-#endif /* !__FreeBSD__ */
+#endif /* !__FreeBSD_kernel__ */
#ifdef DEBUG
/* Lets let people who upgraded kernels know they may have problems */
if (uname (&name) == -1)
Index: rxtx/CNI/SerialImp.h
===================================================================
--- rxtx.orig/CNI/SerialImp.h 2011-02-23 22:53:43.523374359 -0500
+++ rxtx/CNI/SerialImp.h 2011-02-23 22:53:52.663072550 -0500
@@ -97,7 +97,7 @@
/* glue for unsupported linux speeds see also win32termios.h */
-#if !defined(__APPLE__) && !defined(__FreeBSD__) /* dima */
+#if !defined(__APPLE__) && !defined(__FreeBSD_kernel__) /* dima */
/* this is now handled in SerialImp.c
#define B14400 1010001
#define B28800 1010002
@@ -165,7 +165,7 @@
# define LOCKFILEPREFIX "LK."
# define UUCP
#endif /* __sgi__ || sgi */
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD_kernel__)
# define DEVICEDIR "/dev/"
# define LOCKDIR "/var/spool/uucp"
# define LOCKFILEPREFIX "LK."
@@ -176,7 +176,7 @@
# define LOCKDIR "/var/spool/uucp"
# define LOCKFILEPREFIX "LK."
# define UUCP
-#endif /* __FreeBSD__ */
+#endif /* __FreeBSD_kernel__ */
#if defined(__NetBSD__)
# define DEVICEDIR "/dev/"
# define LOCKDIR "/usr/spool/uucp"
Index: rxtx/CNI/SerialImp.c
===================================================================
--- rxtx.orig/CNI/SerialImp.c 2011-02-23 22:53:43.543373697 -0500
+++ rxtx/CNI/SerialImp.c 2011-02-23 22:53:52.663072550 -0500
@@ -382,7 +382,7 @@
ttyset.c_cc[ VMIN ] = 0;
ttyset.c_cc[ VTIME ] = 0;
-#ifdef __FreeBSD__
+#ifdef __FreeBSD_kernel__
if( cfsetspeed( &ttyset, B9600 ) < 0 ) goto fail;
#else
if( cfsetispeed( &ttyset, B9600 ) < 0 ) goto fail;
@@ -686,13 +686,13 @@
return(1);
}
-#ifdef __FreeBSD__
+#ifdef __FreeBSD_kernel__
if( cfsetspeed( &ttyset, cspeed ) < 0 )
{
report( "set_port_params: Cannot Set Speed\n" );
return( 1 );
}
-#endif /* __FreeBSD__ */
+#endif /* __FreeBSD_kernel__ */
if( !cspeed )
{
/* hang up the modem aka drop DTR */
@@ -4257,7 +4257,7 @@
stat(teststring,&mystat);
#endif /* __sun__ */
/* XXX the following hoses freebsd when it tries to open the port later on */
-#ifndef __FreeBSD__
+#ifndef __FreeBSD_kernel__
if(S_ISCHR(mystat.st_mode)){
fd=::OPEN(teststring,O_RDONLY|O_NONBLOCK);
if (fd>0){
|
