paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

reqnum = int; complain if watch failed

Browse Source 
This was SVN commit r655.
This commit is contained in:
janwas 2004-07-08 14:33:58 +00:00
parent 0c05abb304
commit 875d78d10b
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/lib/res/res.cpp
View File

@ -25,12 +25,12 @@ static bool initialized;
// path: portable and relative, must add current directory and convert to native
// better to use a cached string from rel_chdir - secure
int res_watch_dir(const char* const path, uintptr_t* const watch)
int res_watch_dir(const char* const path, intptr_t* const watch)
{
if(!initialized)
{
CHECK_ERR(FAMOpen2(&fc, "lib_res"));
atexit2((void *)FAMClose, (uintptr_t)&fc);
atexit2((void*)FAMClose, (uintptr_t)&fc);
initialized = true;
}
@ -39,14 +39,18 @@ int res_watch_dir(const char* const path, uintptr_t* const watch)
FAMRequest req;
if(FAMMonitorDirectory(&fc, n_full_path, &req, (void*)0) < 0)
return -1; // no way of getting error?
{
*watch = -1;
debug_warn("res_watch_dir failed!");
return -1; // no way of getting error code?
}
*watch = req.reqnum;
*watch = (intptr_t)req.reqnum;
return 0;
}
int res_cancel_watch(const uint watch)
int res_cancel_watch(const intptr_t watch)
{
if(!initialized)
{
@ -55,7 +59,7 @@ int res_cancel_watch(const uint watch)
}
FAMRequest req;
req.reqnum = watch;
req.reqnum = (int)watch;
return FAMCancelMonitor(&fc, &req);
}

4
source/lib/res/res.h
View File

@ -14,8 +14,8 @@ extern int res_reload(const char* fn);
// (wfam limitation)
extern int res_watch_dir(const char* const path, uintptr_t* const watch);
extern int res_watch_dir(const char* const path, intptr_t* const watch);
extern int res_cancel_watch(const uintptr_t watch);
extern int res_cancel_watch(const intptr_t watch);
extern int res_reload_changed_files();