gEDA-cvs: pcb.git: branch: master updated (478d189ab6460bfb61f12cce4c99fbd1d780eede)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  478d189ab6460bfb61f12cce4c99fbd1d780eede (commit)
      from  3fcc7bd23ee151220c442fc775b3b29f98cee2d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/hid/gtk/gui-netlist-window.c |    8 ++++----
 src/hid/lesstif/netlist.c        |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)


=================
 Commit Messages
=================

commit 478d189ab6460bfb61f12cce4c99fbd1d780eede
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    Rename NetlistChanged() to avoid conflicts
    
    Rename the existing static NetlistChanged() functions in
    the Gtk and Lesstif HIDs to avoid conflicts with the core global
    NetlistChanged() function.

:100644 100644 3696c8f... 8fd5360... M	src/hid/gtk/gui-netlist-window.c
:100644 100644 9f85520... ba4415c... M	src/hid/lesstif/netlist.c

=========
 Changes
=========

commit 478d189ab6460bfb61f12cce4c99fbd1d780eede
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    Rename NetlistChanged() to avoid conflicts
    
    Rename the existing static NetlistChanged() functions in
    the Gtk and Lesstif HIDs to avoid conflicts with the core global
    NetlistChanged() function.

diff --git a/src/hid/gtk/gui-netlist-window.c b/src/hid/gtk/gui-netlist-window.c
index 3696c8f..8fd5360 100644
--- a/src/hid/gtk/gui-netlist-window.c
+++ b/src/hid/gtk/gui-netlist-window.c
@@ -975,7 +975,7 @@ ghid_netlist_window_update (gboolean init_nodes)
 }
 
 static gint
-NetlistChanged (int argc, char **argv, int x, int y)
+GhidNetlistChanged (int argc, char **argv, int x, int y)
 {
   loading_new_netlist = TRUE;
   ghid_netlist_window_update (TRUE);
@@ -986,7 +986,7 @@ NetlistChanged (int argc, char **argv, int x, int y)
 }
 
 static gint
-NetlistShow (int argc, char **argv, int x, int y)
+GhidNetlistShow (int argc, char **argv, int x, int y)
 {
   ghid_netlist_window_show (gport, FALSE);
   if (argc > 0)
@@ -995,8 +995,8 @@ NetlistShow (int argc, char **argv, int x, int y)
 }
 
 HID_Action ghid_netlist_action_list[] = {
-  {"NetlistChanged", 0, NetlistChanged},
-  {"NetlistShow", 0, NetlistShow}
+  {"NetlistChanged", 0, GhidNetlistChanged},
+  {"NetlistShow", 0, GhidNetlistShow}
   ,
 };
 
diff --git a/src/hid/lesstif/netlist.c b/src/hid/lesstif/netlist.c
index 9f85520..ba4415c 100644
--- a/src/hid/lesstif/netlist.c
+++ b/src/hid/lesstif/netlist.c
@@ -44,7 +44,7 @@ static XmString *netnode_strings = 0;
 static int n_netnode_strings;
 static int last_pick = -1;
 
-static int NetlistChanged (int argc, char **argv, int x, int y);
+static int LesstifNetlistChanged (int argc, char **argv, int x, int y);
 
 static void
 pick_net (int pick)
@@ -386,7 +386,7 @@ build_netlist_dialog ()
 }
 
 static int
-NetlistChanged (int argc, char **argv, int x, int y)
+LesstifNetlistChanged (int argc, char **argv, int x, int y)
 {
   int i;
   if (!PCB->NetlistLib.MenuN)
@@ -420,7 +420,7 @@ static const char netlistshow_help[] =
 %end-doc */
 
 static int
-NetlistShow (int argc, char **argv, int x, int y)
+LesstifNetlistShow (int argc, char **argv, int x, int y)
 {
   if (build_netlist_dialog ())
     return 0;
@@ -486,9 +486,9 @@ lesstif_show_netlist ()
 }
 
 HID_Action lesstif_netlist_action_list[] = {
-  {"NetlistChanged", 0, NetlistChanged,
+  {"NetlistChanged", 0, LesstifNetlistChanged,
    netlistchanged_help, netlistchanged_syntax},
-  {"NetlistShow", 0, NetlistShow,
+  {"NetlistShow", 0, LesstifNetlistShow,
    netlistshow_help, netlistshow_syntax}
 };
 




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