X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fsonar.h;h=d6473e003e47de2684b58e72086538d1984d3aa9;hp=595dcac95e67f4a128b812876814778b7584cbf0;hb=6f5482d73adb0165c0130bb47d852644ab0c4869;hpb=c70f94f648d51bb4828193124f325fa52b0e57f3

diff --git a/hacks/glx/sonar.h b/hacks/glx/sonar.h
index 595dcac9..d6473e00 100644
--- a/hacks/glx/sonar.h
+++ b/hacks/glx/sonar.h
@@ -1,4 +1,4 @@
-/* sonar, Copyright (c) 1998-2008 Jamie Zawinski and Stephen Martin
+/* sonar, Copyright (c) 1998-2012 Jamie Zawinski and Stephen Martin
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -42,27 +42,30 @@ struct sonar_sensor_data {
 };
 
 /* frees bogie and its contents, including calling the free_bogie_cb. */
-extern void free_bogie (sonar_sensor_data *ssd, sonar_bogie *b);
+extern void sonar_free_bogie (sonar_sensor_data *ssd, sonar_bogie *b);
 
 /* makes a copy of the bogie, not including the 'closure' data. */
-extern sonar_bogie *copy_bogie (sonar_sensor_data *ssd, const sonar_bogie *b);
+extern sonar_bogie *sonar_copy_bogie (sonar_sensor_data *,
+                                      const sonar_bogie *);
 
 
 /* Set up and return sensor state for ICMP pings. */
-extern sonar_sensor_data *init_ping (Display *dpy, 
-                                     char **error_ret,
-                                     const char *subnets,
-                                     int ping_timeout,
-                                     Bool resolve_p, Bool times_p,
-                                     Bool debug_p);
-
-/* Set up and return sensor state for the simulation. */
-extern sonar_sensor_data *init_simulation (Display *dpy,
+extern sonar_sensor_data *sonar_init_ping (Display *dpy, 
                                            char **error_ret,
-                                           const char *team_a_name, 
-                                           const char *team_b_name,
-                                           int team_a_count, 
-                                           int team_b_count,
+                                           char **desc_ret,
+                                           const char *subnets,
+                                           int ping_timeout,
+                                           Bool resolve_p, Bool times_p,
                                            Bool debug_p);
 
+/* Set up and return sensor state for the simulation. */
+extern sonar_sensor_data *sonar_init_simulation (Display *dpy,
+                                                 char **error_ret,
+                                                 char **desc_ret,
+                                                 const char *team_a_name, 
+                                                 const char *team_b_name,
+                                                 int team_a_count, 
+                                                 int team_b_count,
+                                                 Bool debug_p);
+
 #endif /* __SONAR_XSCREENSAVER_H__ */