Switch to unified view

a/src/common/rclinit.h b/src/common/rclinit.h
...
...
38
 * @param argcnf Configuration directory name from the command line (overriding
38
 * @param argcnf Configuration directory name from the command line (overriding
39
 *               default and environment
39
 *               default and environment
40
 * @return the parsed configuration.
40
 * @return the parsed configuration.
41
 */
41
 */
42
enum RclInitFlags {RCLINIT_NONE = 0, RCLINIT_DAEMON = 1, RCLINIT_IDX = 2};
42
enum RclInitFlags {RCLINIT_NONE = 0, RCLINIT_DAEMON = 1, RCLINIT_IDX = 2};
43
extern RclConfig *recollinit(RclInitFlags flags,
43
extern RclConfig *recollinit(int flags,
44
                             void (*cleanup)(void), void (*sigcleanup)(int),
44
                             void (*cleanup)(void), void (*sigcleanup)(int),
45
                             std::string& reason, const string *argcnf = 0);
45
                             std::string& reason, const string *argcnf = 0);
46
inline RclConfig *recollinit(void (*cleanup)(void), void (*sigcleanup)(int),
46
inline RclConfig *recollinit(void (*cleanup)(void), void (*sigcleanup)(int),
47
                             std::string& reason,
47
                             std::string& reason,
48
                             const std::string *argcnf = 0)
48
                             const std::string *argcnf = 0)