Fixed a multitude of C89 compatibility warnings.

[pspp-builds.git] / src / ui / gui / helper.c

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 061e4dc77668be0c431fcbee3e8e7d0a1b9299f5..549242e6f01a1b4b4bfc952a7965242a1f74b46c 100644 (file)
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -1,7 +1,7 @@
 
 #include "helper.h"
-#include "data-in.h"
-#include "message.h"
+#include <data/data-in.h>
+#include <libpspp/message.h>
 
 #include <ctype.h>
 #include <string.h>
@@ -35,16 +35,18 @@ text_to_value(const gchar *text, union value *v,
   if ( format.type != FMT_A) 
     {
       if ( ! text ) return FALSE;
-  
-      const gchar *s = text;
-      while(*s) 
-       {
-         if ( !isspace(*s))
-           break;
-         s++;
-       }
+
+      {
+       const gchar *s = text;
+       while(*s) 
+         {
+           if ( !isspace(*s))
+             break;
+           s++;
+         }
  
-      if ( !*s) return FALSE;
+       if ( !*s) return FALSE;
+      }
     }
 
   di.s = text;
@@ -62,9 +64,11 @@ text_to_value(const gchar *text, union value *v,
 GtkWidget *
 get_widget_assert(GladeXML *xml, const gchar *name)
 {
+  GtkWidget *w;
   g_assert(xml);
   g_assert(name);
-  GtkWidget * w = glade_xml_get_widget(xml, name);
+  
+  w = glade_xml_get_widget(xml, name);
 
   if ( !w ) 
     g_warning("Widget \"%s\" could not be found\n",name);