remove #if's, now in a library

SCCS-vsn: usr.bin/tip/aculib/biz22.c 4.4
SCCS-vsn: usr.bin/tip/aculib/biz31.c 4.7
SCCS-vsn: usr.bin/tip/aculib/df.c 4.8
SCCS-vsn: usr.bin/tip/aculib/dn11.c 4.14
SCCS-vsn: usr.bin/tip/aculib/v3451.c 4.4
SCCS-vsn: usr.bin/tip/aculib/v831.c 4.5
SCCS-vsn: usr.bin/tip/aculib/ventel.c 1.5

diff --git a/usr/src/usr.bin/tip/aculib/biz22.c b/usr/src/usr.bin/tip/aculib/biz22.c
index 384765e..d1c13ed 100644 (file)
--- a/usr/src/usr.bin/tip/aculib/biz22.c
+++ b/usr/src/usr.bin/tip/aculib/biz22.c
@@ -1,10 +1,9 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)biz22.c    4.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)biz22.c    4.4 (Berkeley) %G%";

 #endif
 
 #include "tip.h"
 
 #endif
 
 #include "tip.h"
 

-#if BIZ1022

 #define DISCONNECT_CMD "\20\04"        /* disconnection string */
 
 static int sigALRM();
 #define DISCONNECT_CMD "\20\04"        /* disconnection string */
 
 static int sigALRM();


@@ -152,4 +151,3 @@ detect(s)
        signal(SIGALRM, f);
        return (timeout == 0);
 }
        signal(SIGALRM, f);
        return (timeout == 0);
 }

-#endif

diff --git a/usr/src/usr.bin/tip/aculib/biz31.c b/usr/src/usr.bin/tip/aculib/biz31.c
index fda6f19..bb5e277 100644 (file)
--- a/usr/src/usr.bin/tip/aculib/biz31.c
+++ b/usr/src/usr.bin/tip/aculib/biz31.c
@@ -1,10 +1,9 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)biz31.c    4.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)biz31.c    4.7 (Berkeley) %G%";

 #endif
 
 #include "tip.h"
 
 #endif
 
 #include "tip.h"
 

-#if BIZ1031

 #define MAXRETRY       3               /* sync up retry count */
 #define DISCONNECT_CMD "\21\25\11\24"  /* disconnection string */
 
 #define MAXRETRY       3               /* sync up retry count */
 #define DISCONNECT_CMD "\21\25\11\24"  /* disconnection string */
 


@@ -214,4 +213,3 @@ retry:
        }
        return (1);
 }
        }
        return (1);
 }

-#endif

diff --git a/usr/src/usr.bin/tip/aculib/df.c b/usr/src/usr.bin/tip/aculib/df.c
index 504e97e..12fe4ce 100644 (file)
--- a/usr/src/usr.bin/tip/aculib/df.c
+++ b/usr/src/usr.bin/tip/aculib/df.c
@@ -1,34 +1,29 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)df.c       4.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)df.c       4.8 (Berkeley) %G%";

 #endif
 
 /*
  * Dial the DF02-AC or DF03-AC
  */
 
 #endif
 
 /*
  * Dial the DF02-AC or DF03-AC
  */
 

-#if defined(DF02) || defined(DF03)

 #include "tip.h"
 
 static jmp_buf Sjbuf;
 static timeout();
 
 #include "tip.h"
 
 static jmp_buf Sjbuf;
 static timeout();
 

-#if DF02

 df02_dialer(num, acu)
        char *num, *acu;
 {
 
        return (df_dialer(num, acu, 0));
 }
 df02_dialer(num, acu)
        char *num, *acu;
 {
 
        return (df_dialer(num, acu, 0));
 }

-#endif

 
 

-#if DF03

 df03_dialer(num, acu)
        char *num, *acu;
 {
 
        return (df_dialer(num, acu, 1));
 }
 df03_dialer(num, acu)
        char *num, *acu;
 {
 
        return (df_dialer(num, acu, 1));
 }

-#endif

 
 df_dialer(num, acu, df03)
        char *num, *acu;
 
 df_dialer(num, acu, df03)
        char *num, *acu;


@@ -102,4 +97,3 @@ timeout()
 
        longjmp(Sjbuf, 1);
 }
 
        longjmp(Sjbuf, 1);
 }

-#endif

diff --git a/usr/src/usr.bin/tip/aculib/dn11.c b/usr/src/usr.bin/tip/aculib/dn11.c
index 07616f8..091ff51 100644 (file)
--- a/usr/src/usr.bin/tip/aculib/dn11.c
+++ b/usr/src/usr.bin/tip/aculib/dn11.c
@@ -1,8 +1,7 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)dn11.c     4.13 (Berkeley) %G%";
+static char sccsid[] = "@(#)dn11.c     4.14 (Berkeley) %G%";

 #endif
 
 #endif
 

-#if DN11

 /*
  * Routines for dialing up on DN-11
  */
 /*
  * Routines for dialing up on DN-11
  */


@@ -107,4 +106,3 @@ dn_abort()
                ioctl(FD, TIOCCDTR, 0);
        close(FD);
 }
                ioctl(FD, TIOCCDTR, 0);
        close(FD);
 }

-#endif

diff --git a/usr/src/usr.bin/tip/aculib/v3451.c b/usr/src/usr.bin/tip/aculib/v3451.c
index bbf8527..6c43218 100644 (file)
--- a/usr/src/usr.bin/tip/aculib/v3451.c
+++ b/usr/src/usr.bin/tip/aculib/v3451.c
@@ -1,8 +1,7 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)v3451.c    4.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)v3451.c    4.4 (Berkeley) %G%";

 #endif
 
 #endif
 

-#ifdef V3451

 /*
  * Routines for calling up on a Vadic 3451 Modem
  */
 /*
  * Routines for calling up on a Vadic 3451 Modem
  */


@@ -175,4 +174,3 @@ prefix(s1, s2)
                        return (1);
        return (c == '\0');
 }
                        return (1);
        return (c == '\0');
 }

-#endif

diff --git a/usr/src/usr.bin/tip/aculib/v831.c b/usr/src/usr.bin/tip/aculib/v831.c
index 88ff50c..69b4f36 100644 (file)
--- a/usr/src/usr.bin/tip/aculib/v831.c
+++ b/usr/src/usr.bin/tip/aculib/v831.c
@@ -1,8 +1,7 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)v831.c     4.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)v831.c     4.5 (Berkeley) %G%";

 #endif
 
 #endif
 

-#ifdef V831

 /*
  * Routines for dialing up on Vadic 831
  */
 /*
  * Routines for dialing up on Vadic 831
  */


@@ -129,7 +128,6 @@ v831_abort()
                 ioctl(FD, TIOCCDTR, 0);
         close(FD);
 }
                 ioctl(FD, TIOCCDTR, 0);
         close(FD);
 }

-#endif

 
 /*
  * Sigh, this probably must be changed at each site.
 
 /*
  * Sigh, this probably must be changed at each site.

diff --git a/usr/src/usr.bin/tip/aculib/ventel.c b/usr/src/usr.bin/tip/aculib/ventel.c
index 859795e..49d817b 100644 (file)
--- a/usr/src/usr.bin/tip/aculib/ventel.c
+++ b/usr/src/usr.bin/tip/aculib/ventel.c
@@ -1,8 +1,7 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)ventel.c   1.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)ventel.c   1.5 (Berkeley) %G%";

 #endif
 
 #endif
 

-#if VENTEL

 /*
  * Routines for calling up on a Ventel Modem
  * The Ventel is expected to be strapped for "no echo".
 /*
  * Routines for calling up on a Ventel Modem
  * The Ventel is expected to be strapped for "no echo".


@@ -180,4 +179,3 @@ vensync(fd)
        }
        return (0);
 }
        }
        return (0);
 }

-#endif