Commit 922346ec authored by sletz's avatar sletz
Browse files

Change prototype

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1747 0c269be4-1314-0410-8aa9-9f06e86f4224
parent b476133d
......@@ -260,7 +260,7 @@ bool JackServerGlobals::Init()
#ifndef WIN32
if (server_name == NULL)
server_name = JackTools::DefaultServerName();
server_name = (char*)JackTools::DefaultServerName();
#endif
rc = jack_register_server(server_name, false);
......
......@@ -71,7 +71,7 @@ static void start_server_aux(const char* server_name)
}
if (!good) {
command = JACK_LOCATION "/jackd";
command = (char*)(JACK_LOCATION "/jackd");
strncpy(arguments, JACK_LOCATION "/jackd -T -d "JACK_DEFAULT_DRIVER, 255);
} else {
result = strcspn(arguments, " ");
......
......@@ -29,7 +29,7 @@ namespace Jack
{
#define DEFAULT_TMP_DIR "/tmp"
char* jack_tmpdir = DEFAULT_TMP_DIR;
char* jack_tmpdir = (char*)DEFAULT_TMP_DIR;
int JackTools::GetPID()
{
......@@ -50,9 +50,9 @@ int JackTools::GetUID()
#endif
}
char* JackTools::DefaultServerName()
const char* JackTools::DefaultServerName()
{
char* server_name;
const char* server_name;
if ((server_name = getenv("JACK_DEFAULT_SERVER")) == NULL)
server_name = "default";
return server_name;
......
......@@ -42,7 +42,7 @@ namespace Jack
static char* UserDir();
static char* ServerDir(const char* server_name, char* server_dir);
static char* DefaultServerName();
static const char* DefaultServerName();
static void CleanupFiles(const char* server_name);
static int GetTmpdir();
static void RewriteName(const char* name, char* new_name);
......
......@@ -307,7 +307,7 @@ int main(int argc, char* argv[])
}
if (server_name == NULL)
server_name = JackTools::DefaultServerName();
server_name = (char*)JackTools::DefaultServerName();
copyright(stdout);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment