gEDA-cvs: CVS update: globals.h

[cvspsrv@xxxxxxxx]

  User: werner  
  Date: 06/12/12 12:32:48

  Modified:    .        Tag: autonumber globals.h i_vars.h prototype.h
  Log:
  	sync autonumber branch with trunk
  
  
  
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.15.4.1  +14 -0     eda/geda/gaf/gschem/include/globals.h
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: globals.h
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/include/globals.h,v
  retrieving revision 1.15
  retrieving revision 1.15.4.1
  diff -u -b -r1.15 -r1.15.4.1
  --- globals.h	28 Sep 2006 18:00:31 -0000	1.15
  +++ globals.h	12 Dec 2006 17:32:48 -0000	1.15.4.1
  @@ -97,5 +97,19 @@
   # define N_(String) (String)
   #endif
   
  +/*
  + * __attribute__((unused)) is a gcc extension so define
  + * a portable macro, ATTRIBUTE_UNUSED, to use instead
  + */
  +#ifndef GCC_VERSION
  +#define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
  +#endif /* GCC_VERSION */
  +
  +#if GCC_VERSION > 2007
  +#define ATTRIBUTE_UNUSED __attribute__((unused))
  +#else
  +#define ATTRIBUTE_UNUSED
  +#endif
  +
   /*EK* used by prototype.h */
   #include "../include/x_states.h"
  
  
  
  1.37.4.1  +1 -0      eda/geda/gaf/gschem/include/i_vars.h
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: i_vars.h
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/include/i_vars.h,v
  retrieving revision 1.37
  retrieving revision 1.37.4.1
  diff -u -b -r1.37 -r1.37.4.1
  --- i_vars.h	30 Aug 2006 11:06:16 -0000	1.37
  +++ i_vars.h	12 Dec 2006 17:32:48 -0000	1.37.4.1
  @@ -15,6 +15,7 @@
   extern int default_net_endpoint_mode;
   extern int default_net_midpoint_mode;
   extern int default_pin_color;
  +extern int default_line_style;
   extern int default_pin_style;
   extern int default_net_style;
   extern int default_bus_style;
  
  
  
  1.148.4.2 +6 -4      eda/geda/gaf/gschem/include/prototype.h
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: prototype.h
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/include/prototype.h,v
  retrieving revision 1.148.4.1
  retrieving revision 1.148.4.2
  diff -u -b -r1.148.4.1 -r1.148.4.2
  --- prototype.h	6 Nov 2006 19:16:43 -0000	1.148.4.1
  +++ prototype.h	12 Dec 2006 17:32:48 -0000	1.148.4.2
  @@ -1,4 +1,4 @@
  -/* $Id: prototype.h,v 1.148.4.1 2006/11/06 19:16:43 werner Exp $ */
  +/* $Id: prototype.h,v 1.148.4.2 2006/12/12 17:32:48 werner Exp $ */
   
   /* a_pan.c */
   void a_pan_general(TOPLEVEL *w_current, double world_cx, double world_cy, 
  @@ -39,7 +39,7 @@
   g_set_attrib_text_properties(SCM attrib_smob, SCM scm_colorname, SCM scm_size, 
   			     SCM scm_alignment, SCM scm_rotation, SCM scm_x,
   			     SCM scm_y);
  -SCM g_get_object_bounds (SCM object_smob, SCM scm_inc_attribs);
  +SCM g_get_object_bounds (SCM object_smob, SCM scm_exclude_attribs, SCM scm_exclude_object_type);
   SCM g_get_object_pins (SCM object_smob);
   SCM g_add_component(SCM page_smob, SCM scm_comp_name, SCM scm_x, SCM scm_y, 
   		    SCM scm_angle, SCM scm_selectable, SCM scm_mirror);
  @@ -211,6 +211,7 @@
   SCM g_rc_net_style(SCM mode);
   SCM g_rc_bus_style(SCM mode);
   SCM g_rc_pin_style(SCM mode);
  +SCM g_rc_line_style(SCM mode);
   SCM g_rc_action_feedback_mode(SCM mode);
   SCM g_rc_zoom_with_pan(SCM mode);
   SCM g_rc_text_feedback(SCM mode);
  @@ -294,12 +295,13 @@
   void i_set_state(TOPLEVEL *w_current, enum x_states newstate);
   void i_set_state_msg(TOPLEVEL *w_current, enum x_states newstate, const char *message);
   void i_update_left_button(const char *string);
  -void i_update_middle_button(TOPLEVEL *w_current, void *func_ptr, const char *string);
  +void i_update_middle_button(TOPLEVEL *w_current, void (*func_ptr)(gpointer, guint, GtkWidget*), const char *string);
   void i_update_right_button(const char *string);
   void i_update_toolbar(TOPLEVEL *w_current);
   void i_update_menus(TOPLEVEL *w_current);
   void i_update_cursor(TOPLEVEL *w_current);
  -void i_set_filename(TOPLEVEL *w_current, const char *string);
  +void i_set_filename(TOPLEVEL *w_current, const gchar *string);
  +void i_set_grid(TOPLEVEL *w_current, int visible_grid);
   /* i_callbacks.c */
   void i_callback_file_new(gpointer data, guint callback_action, GtkWidget *widget);
   void i_callback_toolbar_file_new(GtkWidget *widget, gpointer data);
  
  
  


_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs