gcalctool r2020 - branches/gnome-2-22/gcalctool

[richb svn gnome org]

Author: richb
Date: Mon Mar 10 21:14:27 2008
New Revision: 2020
URL: http://svn.gnome.org/viewvc/gcalctool?rev=2020&view=rev

Log:
    * gcalctool/calctool.c:
      gcalctool/gtk.c:
      From Jens Granseuer <jensgr at gmx dot net>
      Fixed bug #521668 â compile errors.


Modified:
   branches/gnome-2-22/gcalctool/calctool.c
   branches/gnome-2-22/gcalctool/gtk.c

Modified: branches/gnome-2-22/gcalctool/calctool.c
==============================================================================
--- branches/gnome-2-22/gcalctool/calctool.c	(original)
+++ branches/gnome-2-22/gcalctool/calctool.c	Mon Mar 10 21:14:27 2008
@@ -736,6 +736,7 @@
 main(int argc, char **argv)
 {
     char *ptr;
+    struct exprm_state *e;
     
     v = (Vars)  LINT_CAST(calloc(1, sizeof(struct calcVars)));
 
@@ -771,7 +772,6 @@
     show_display(v->MPdisp_val);     /* Output in correct display mode. */
 
     memset(&(v->h), 0, sizeof(struct exprm_state_history)); /* clear expression mode state history*/
-    struct exprm_state *e;
     e = get_state();
     e->clear = 1;              /* Clear initial state as if clear was pressed */
     

Modified: branches/gnome-2-22/gcalctool/gtk.c
==============================================================================
--- branches/gnome-2-22/gcalctool/gtk.c	(original)
+++ branches/gnome-2-22/gcalctool/gtk.c	Mon Mar 10 21:14:27 2008
@@ -916,12 +916,12 @@
 
           case EXPRS: 
               {
+                  char *bit_str, label[3], tmp[MAXLINE];
                   int ret = usable_num(MP);
                   if (ret || !is_integer(MP)) {
                       gtk_widget_set_sensitive(X->bit_panel, FALSE);
                       return;
                   }
-                  char *bit_str, label[3], tmp[MAXLINE];
                   bit_str = make_fixed(MP, tmp, BIN, MAXLINE, FALSE);
                   bit_str_len = strlen(bit_str);
                   if (bit_str_len <= MAXBITS) {