diff options
author | Eric S. Raymond <esr@thyrsus.com> | 2006-11-02 05:15:20 +0000 |
---|---|---|
committer | Eric S. Raymond <esr@thyrsus.com> | 2006-11-02 05:15:20 +0000 |
commit | bb39fd5e0d42af6d926b9547dcf33f00145c42dd (patch) | |
tree | 70efef5926d3812cf321e7f65e79b48c2d65f952 /ntpshm.c | |
parent | 51cce15a3b63a3802a2301fb41bdfc25d8a77228 (diff) | |
download | gpsd-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.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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"); |