projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.35.tar.gz
[xscreensaver]
/
hacks
/
glx
/
sonar-icmp.c
diff --git
a/hacks/glx/sonar-icmp.c
b/hacks/glx/sonar-icmp.c
index 50861259e768e8bca7305d37db57c9b33ecf2da6..253cb8eb8d41e6fb60d9967bfd46d2096b549677 100644
(file)
--- a/
hacks/glx/sonar-icmp.c
+++ b/
hacks/glx/sonar-icmp.c
@@
-40,7
+40,7
@@
*/
#endif
*/
#endif
-#ifndef
USE_IPHON
E
+#ifndef
HAVE_MOBIL
E
# define READ_FILES
#endif
# define READ_FILES
#endif
@@
-53,7
+53,9
@@
# include <sys/types.h>
# include <sys/time.h>
# include <sys/ipc.h>
# include <sys/types.h>
# include <sys/time.h>
# include <sys/ipc.h>
-# include <sys/shm.h>
+# ifndef HAVE_ANDROID
+# include <sys/shm.h>
+# endif
# include <sys/socket.h>
# include <netinet/in_systm.h>
# include <netinet/in.h>
# include <sys/socket.h>
# include <netinet/in_systm.h>
# include <netinet/in.h>
@@
-88,7
+90,7
@@
# undef HAVE_PING
#endif
# undef HAVE_PING
#endif
-#ifndef
USE_IPHON
E
+#ifndef
HAVE_MOBIL
E
# define LOAD_FILES
#endif
# define LOAD_FILES
#endif
@@
-448,7
+450,7
@@
read_hosts_file (sonar_sensor_data *ssd, const char *filename)
{
char buf[1024];
sprintf(buf, "%s: %s", progname, filename);
{
char buf[1024];
sprintf(buf, "%s: %s", progname, filename);
-#ifdef HAVE_
COCOA
+#ifdef HAVE_
JWXYZ
if (pd->debug_p) /* on OSX don't syslog this */
#endif
perror (buf);
if (pd->debug_p) /* on OSX don't syslog this */
#endif
perror (buf);
@@
-1410,7
+1412,7
@@
ping_scan (sonar_sensor_data *ssd)
if (sb && !pb->lookup_addr)
{
if (sb && !pb->lookup_addr)
{
-
assert (pb->addrlen
);
+
if (!pb->addrlen) abort(
);
send_ping (pd, sb);
pd->last_pinged = sb;
}
send_ping (pd, sb);
pd->last_pinged = sb;
}