Merge release-5-0 into master

[alexxy/gromacs.git] / src / programs / view / logo.cpp

diff --git a/src/programs/view/logo.cpp b/src/programs/view/logo.cpp
index 8c56da42d3d41549f78500923a89983cc6886ef1..b3238d39c8f9db46b571f6aca34c90a992092352 100644 (file)
--- a/src/programs/view/logo.cpp
+++ b/src/programs/view/logo.cpp
@@ -38,14 +38,17 @@
 #include <config.h>
 #endif
 
-#include "sysstuff.h"
+#include <stdlib.h>
+
 #include "macros.h"
 #include "xutil.h"
 #include "Xstuff.h"
-#include "gromacs/utility/smalloc.h"
 #include "copyrite.h"
 #include "logo.h"
 
+#include "gromacs/utility/real.h"
+#include "gromacs/utility/smalloc.h"
+
 typedef struct {
     int            x, y, rad;
     unsigned long *col;
@@ -111,7 +114,6 @@ static bool LogoCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
     };
 #define NMESS asize(Mess)
     int             i;
-    real            wfac, hfac;
     t_logo         *logo;
     t_windata      *wd;
 
@@ -119,8 +121,8 @@ static bool LogoCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
     wd   = &(logo->wd);
     if (bFirst)
     {
-        wfac = wd->width/110.0;
-        hfac = wd->height/110.0;
+        const real wfac = wd->width/110.0;
+        const real hfac = wd->height/110.0;
         for (i = 0; (i < asize(c)); i++)
         {
             c[i].x *= wfac;