sqrt() is double; dist2() might as well be too [caught by gcc2]

SCCS-vsn: lib/libplot/t300/line.c 4.3
SCCS-vsn: lib/libplot/t300/subr.c 4.3
SCCS-vsn: lib/libplot/t300s/line.c 4.3
SCCS-vsn: lib/libplot/t300s/subr.c 4.3
SCCS-vsn: lib/libplot/t450/line.c 4.3
SCCS-vsn: lib/libplot/t450/subr.c 4.3

diff --git a/usr/src/lib/libplot/t300/line.c b/usr/src/lib/libplot/t300/line.c
index ac8660e..5ea31d0 100644 (file)
--- a/usr/src/lib/libplot/t300/line.c
+++ b/usr/src/lib/libplot/t300/line.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include "con.h"
 #endif /* not lint */
 
 #include "con.h"


@@ -22,7 +22,7 @@ iline(cx0,cy0,cx1,cy1){
        int maxp,tt,j,np;
        char chx,chy;
        float xd,yd;
        int maxp,tt,j,np;
        char chx,chy;
        float xd,yd;

-       float dist2(),sqrt();
+       double dist2(),sqrt();

                movep(cx0,cy0);
                maxp = sqrt(dist2(cx0,cy0,cx1,cy1))/2.;
                xd = cx1-cx0;
                movep(cx0,cy0);
                maxp = sqrt(dist2(cx0,cy0,cx1,cy1))/2.;
                xd = cx1-cx0;

diff --git a/usr/src/lib/libplot/t300/subr.c b/usr/src/lib/libplot/t300/subr.c
index eee3196..3e87d92 100644 (file)
--- a/usr/src/lib/libplot/t300/subr.c
+++ b/usr/src/lib/libplot/t300/subr.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include <stdio.h>
 #endif /* not lint */
 
 #include <stdio.h>


@@ -61,7 +61,7 @@ reset()
        exit();
 }
 
        exit();
 }
 

-float
+double

 dist2 (x1, y1, x2, y2)
 {
        float t,v;
 dist2 (x1, y1, x2, y2)
 {
        float t,v;

diff --git a/usr/src/lib/libplot/t300s/line.c b/usr/src/lib/libplot/t300s/line.c
index d1f0925..405770a 100644 (file)
--- a/usr/src/lib/libplot/t300s/line.c
+++ b/usr/src/lib/libplot/t300s/line.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include "con.h"
 #endif /* not lint */
 
 #include "con.h"


@@ -22,7 +22,7 @@ iline(cx0,cy0,cx1,cy1){
        int maxp,tt,j,np;
        char chx,chy,command;
            float xd,yd;
        int maxp,tt,j,np;
        char chx,chy,command;
            float xd,yd;

-       float dist2(),sqrt();
+       double dist2(),sqrt();

        movep(cx0,cy0);
        maxp = sqrt(dist2(cx0,cy0,cx1,cy1))/2.;
        xd = cx1-cx0;
        movep(cx0,cy0);
        maxp = sqrt(dist2(cx0,cy0,cx1,cy1))/2.;
        xd = cx1-cx0;

diff --git a/usr/src/lib/libplot/t300s/subr.c b/usr/src/lib/libplot/t300s/subr.c
index a3238e8..4173ccc 100644 (file)
--- a/usr/src/lib/libplot/t300s/subr.c
+++ b/usr/src/lib/libplot/t300s/subr.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include <stdio.h>
 #endif /* not lint */
 
 #include <stdio.h>


@@ -63,7 +63,7 @@ reset()
        exit();
 }
 
        exit();
 }
 

-float
+double

 dist2 (x1, y1, x2, y2)
 {
        float t,v;
 dist2 (x1, y1, x2, y2)
 {
        float t,v;

diff --git a/usr/src/lib/libplot/t450/line.c b/usr/src/lib/libplot/t450/line.c
index 2786122..993cf55 100644 (file)
--- a/usr/src/lib/libplot/t450/line.c
+++ b/usr/src/lib/libplot/t450/line.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include "con.h"
 #endif /* not lint */
 
 #include "con.h"


@@ -22,7 +22,7 @@ iline(cx0,cy0,cx1,cy1){
        int maxp,tt,j,np;
        char chx,chy;
        float xd,yd;
        int maxp,tt,j,np;
        char chx,chy;
        float xd,yd;

-       float dist2(),sqrt();
+       double dist2(),sqrt();

                movep(cx0,cy0);
                maxp = sqrt(dist2(cx0,cy0,cx1,cy1))/2.;
                xd = cx1-cx0;
                movep(cx0,cy0);
                maxp = sqrt(dist2(cx0,cy0,cx1,cy1))/2.;
                xd = cx1-cx0;

diff --git a/usr/src/lib/libplot/t450/subr.c b/usr/src/lib/libplot/t450/subr.c
index 6be04ea..e62f9b3 100644 (file)
--- a/usr/src/lib/libplot/t450/subr.c
+++ b/usr/src/lib/libplot/t450/subr.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include <stdio.h>
 #endif /* not lint */
 
 #include <stdio.h>


@@ -65,7 +65,7 @@ reset()
        exit();
 }
 
        exit();
 }
 

-float
+double

 dist2 (x1, y1, x2, y2)
 {
        float t,v;
 dist2 (x1, y1, x2, y2)
 {
        float t,v;