Sort includes outside src/gromacs

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

diff --git a/src/programs/view/logo.cpp b/src/programs/view/logo.cpp
index 8c56da42d3d41549f78500923a89983cc6886ef1..ee182e2e235eff32d4c960064fd7523a17ca3fc5 100644 (file)
--- a/src/programs/view/logo.cpp
+++ b/src/programs/view/logo.cpp
@@ -34,18 +34,20 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
 
-#include "sysstuff.h"
-#include "macros.h"
-#include "xutil.h"
-#include "Xstuff.h"
-#include "gromacs/utility/smalloc.h"
-#include "copyrite.h"
 #include "logo.h"
 
+#include <stdlib.h>
+
+#include "gromacs/legacyheaders/copyrite.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/utility/real.h"
+#include "gromacs/utility/smalloc.h"
+
+#include "Xstuff.h"
+#include "xutil.h"
+
 typedef struct {
     int            x, y, rad;
     unsigned long *col;
@@ -111,7 +113,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 +120,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;