github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

SysInfo, Functions4U: XTEST functions now need flag XTEST, fixed to compile with old GCC

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8843 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-08-24 12:45:24 +00:00
parent 02dcbb1640
commit 0c28ff0c36
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bazaar/Functions4U/Functions4U.h
View file

@ -562,12 +562,12 @@ private:
class LocalProcessX {
public:
LocalProcessX() : status(STOP_OK) {}
enum Status {RUNNING = 1, STOP_OK = 0, STOP_TIMEOUT = -1, STOP_USER = -2};
enum LPStatus {RUNNING = 1, STOP_OK = 0, STOP_TIMEOUT = -1, STOP_USER = -2}; // name clash with X11 Status
bool Start(const char *cmd, const char *envptr = 0, const char *dir = 0, double _refreshTime = -1, double _timeOut = -1, bool convertcharset = true) {
p.ConvertCharset(convertcharset);
timeElapsed.Reset();
timeToTimeout.Reset();
if(!p.Start(cmd, envptr, dir))
if(!p.Start(cmd, envptr/*, dir*/))
return false;
status = RUNNING;
timeOut = _timeOut;
@ -608,7 +608,7 @@ public:
KillTimeCallback(this);
#endif
}
void Stop(Status _status = STOP_USER) {
void Stop(LPStatus _status = STOP_USER) {
if (!IsRunning())
return;
status = _status;
@ -627,7 +627,7 @@ public:
LocalProcess p;
private:
TimeStop timeElapsed, timeToTimeout;
Status status;
LPStatus status;
double timeOut;
double refreshTime;
};