mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-11 22:03:01 -06:00
Bazaar Functions4U, SysInfo fixed to compile
git-svn-id: svn://ultimatepp.org/upp/trunk@10904 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
parent
8ac7d86bf1
commit
8a1720c4d5
5 changed files with 10 additions and 5 deletions
|
|
@ -101,6 +101,7 @@ bool LaunchFile(const char *file, const char *params, const char *directory) {
|
|||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef PLATFORM_POSIX
|
||||
|
||||
String GetDesktopManagerNew() {
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ enum EXT_FILE_FLAGS {NO_FLAG = 0,
|
|||
//ASK_BEFORE_DELETE = 8
|
||||
};
|
||||
|
||||
String GetDesktopManagerNew();
|
||||
|
||||
bool LaunchFile(const char *file, const char *params = 0, const char *directory = ".");
|
||||
|
||||
bool FileCat(const char *file, const char *appendFile);
|
||||
|
|
|
|||
|
|
@ -2212,8 +2212,11 @@ bool IsPortFree(int port) {
|
|||
bool ret = true;
|
||||
if(bind(socket_desc,(struct sockaddr *)&service , sizeof(service)) < 0)
|
||||
ret = false;
|
||||
|
||||
#ifdef PLATFORM_WIN32
|
||||
closesocket(socket_desc);
|
||||
#else
|
||||
close(socket_desc);
|
||||
#endif
|
||||
|
||||
#ifdef PLATFORM_WIN32
|
||||
WSACleanup();
|
||||
|
|
|
|||
|
|
@ -101,7 +101,6 @@ bool ProcessExists(int64 pid);
|
|||
/////////////////////////////////////////////////////////////////////
|
||||
// Os Info
|
||||
bool GetOsInfo(String &kernel, String &kerVersion, String &kerArchitecture, String &distro, String &distVersion, String &desktop, String &deskVersion);
|
||||
String GetDesktopManagerNew();
|
||||
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
// Get drives info
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ library(POSIX) Xtst;
|
|||
options(MSC) "/D PSAPI_VERSION=1";
|
||||
|
||||
file
|
||||
SysInfo.cpp,
|
||||
SysInfo_in.h,
|
||||
SysInfo.h,
|
||||
Os.cpp,
|
||||
SysInfo_in.h,
|
||||
SysInfo.cpp,
|
||||
OS.cpp,
|
||||
srcdoc.tpp,
|
||||
ScreenGrab.cpp,
|
||||
MouseKey.cpp,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue