timerd/timermanager.cpp: rename CONFIGFILE to TIMERDCONFIGFILE to avoid conflicts

Origin commit data
------------------
Branch: ni/coolstream
Commit: 8952a4c79a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-15 (Thu, 15 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2015-01-15 15:17:13 +03:00
parent 81f15301c4
commit d9dcbeec05
2 changed files with 8 additions and 8 deletions

View File

@@ -35,7 +35,7 @@
#include <eventserver.h>
#include <timerdclient/timerdtypes.h>
#define CONFIGFILE CONFIGDIR "/timerd.conf"
#define TIMERDCONFIGFILE CONFIGDIR "/timerd.conf"
class CTimerEvent
{