summaryrefslogtreecommitdiff
path: root/ntpshm.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2006-11-02 05:15:20 +0000
committerEric S. Raymond <esr@thyrsus.com>2006-11-02 05:15:20 +0000
commitbb39fd5e0d42af6d926b9547dcf33f00145c42dd (patch)
tree70efef5926d3812cf321e7f65e79b48c2d65f952 /ntpshm.c
parent51cce15a3b63a3802a2301fb41bdfc25d8a77228 (diff)
downloadgpsd-bb39fd5e0d42af6d926b9547dcf33f00145c42dd.tar.gz
Sigh...avoid harmless but *annoying* name collision...
between our LOG_ERR and the syslog() macro by changing ours to LOG_ERROR.
Diffstat (limited to 'ntpshm.c')
-rw-r--r--ntpshm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ntpshm.c b/ntpshm.c
index 4c4f2153..4bf2905e 100644
--- a/ntpshm.c
+++ b/ntpshm.c
@@ -54,13 +54,13 @@ static /*@null@*/ struct shmTime *getShmTime(int unit)
int shmid=shmget ((key_t)(NTPD_BASE+unit),
sizeof (struct shmTime), IPC_CREAT|0644);
if (shmid == -1) {
- gpsd_report(LOG_ERR, "shmget failed\n");
+ gpsd_report(LOG_ERROR, "shmget failed\n");
return NULL;
} else {
struct shmTime *p=(struct shmTime *)shmat (shmid, 0, 0);
/*@ -mustfreefresh */
if ((int)(long)p == -1) {
- gpsd_report(LOG_ERR, "shmat failed\n");
+ gpsd_report(LOG_ERROR, "shmat failed\n");
return NULL;
}
gpsd_report(LOG_PROG, "shmat(%d,0,0) succeeded\n");