|
1 The zs serial port driver has been removed from Solaris. The zs specific code |
|
2 in the parsolaris.c and parsestreams.c file now fails to compile. This patch |
|
3 simply replaces the "ifdef sun" sections of code with a fictious define to |
|
4 prevent the zs code from being compiled. The removal of all driver specific |
|
5 code has been reported to the community as bug 2988 |
|
6 (http://bugs.ntp.org/show_bug.cgi?id=2988) This patch may be removed when NTP |
|
7 is upgraded to a version that has that bug resolved. |
|
8 |
|
9 --- libparse/parsesolaris.c |
|
10 +++ libparse/parsesolaris.c |
|
11 @@ -804,7 +804,7 @@ init_linemon( |
|
12 |
|
13 pprintf(DD_INSTALL, "init_linemon: driver is \"%s\"\n", dname); |
|
14 |
|
15 -#ifdef sun |
|
16 +#ifdef no_zs_sun |
|
17 if (dname && !strcmp(dname, "zs")) |
|
18 { |
|
19 return init_zs_linemon(dq, q); |
|
20 @@ -833,7 +833,7 @@ close_linemon( |
|
21 { |
|
22 register char *dname = q->q_qinfo->qi_minfo->mi_idname; |
|
23 |
|
24 -#ifdef sun |
|
25 +#ifdef no_zs_sun |
|
26 if (dname && !strcmp(dname, "zs")) |
|
27 { |
|
28 close_zs_linemon(q, my_q); |
|
29 @@ -845,7 +845,7 @@ close_linemon( |
|
30 pprintf(DD_INSTALL, "close_linemon: cannot find driver name\n"); |
|
31 } |
|
32 |
|
33 -#ifdef sun |
|
34 +#ifdef no_zs_sun |
|
35 #include <sys/tty.h> |
|
36 #include <sys/zsdev.h> |
|
37 #include <sys/ser_async.h> |
|
38 --- libparse/parsestreams.c |
|
39 +++ libparse/parsestreams.c |
|
40 @@ -954,7 +954,7 @@ init_linemon( |
|
41 |
|
42 parseprintf(DD_INSTALL, ("init_linemon: driver is \"%s\"\n", dname)); |
|
43 |
|
44 -#ifdef sun |
|
45 +#ifdef no_zs_sun |
|
46 if (dname && !Strcmp(dname, "zs")) |
|
47 { |
|
48 return init_zs_linemon(dq, q); |
|
49 @@ -983,7 +983,7 @@ close_linemon( |
|
50 { |
|
51 register char *dname = q->q_qinfo->qi_minfo->mi_idname; |
|
52 |
|
53 -#ifdef sun |
|
54 +#ifdef no_zs_sun |
|
55 if (dname && !Strcmp(dname, "zs")) |
|
56 { |
|
57 close_zs_linemon(q, my_q); |
|
58 @@ -995,7 +995,7 @@ close_linemon( |
|
59 parseprintf(DD_INSTALL, ("close_linemon: cannot find driver name\n")); |
|
60 } |
|
61 |
|
62 -#ifdef sun |
|
63 +#ifdef no_zs_sun |
|
64 |
|
65 #include <sundev/zsreg.h> |
|
66 #include <sundev/zscom.h> |