Commit 0f3f11a7 authored by Alexander Setzer's avatar Alexander Setzer
Browse files

Fixes errors with my compiler on linux.

parent ed3aefce
......@@ -31,7 +31,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
relink_command="(cd /home/thorsten/ClionProjects/RelayMQ; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=/home/thorsten/Arbeit/clion-1.2.4/bin:; export LD_LIBRARY_PATH; PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games; export PATH; gcc -std=gnu99 -Werror=format-security -g -O2 -o \$progdir/\$file src/src_application_template-application_template.o src/.libs/librelaymq.so -L/usr/local/lib /usr/local/lib/libczmq.so /usr/local/lib/libzmq.so -pthread -Wl,-rpath -Wl,/home/thorsten/ClionProjects/RelayMQ/src/.libs)"
relink_command="(cd /home/asetzer/git/RelayMQ; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; PATH=/usr/bin:/home/asetzer/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games; export PATH; gcc -std=gnu99 -Werror=format-security -I/home/asetzer/local/include -o \$progdir/\$file src/src_application_template-application_template.o -L/home/asetzer/local/lib src/.libs/librelaymq.so -luuid /home/asetzer/local/lib/libczmq.so -lzmq -pthread -Wl,-rpath -Wl,/home/asetzer/git/RelayMQ/src/.libs -Wl,-rpath -Wl,/home/asetzer/local/lib -Wl,-rpath -Wl,/home/asetzer/local/lib)"
# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
......
......@@ -31,7 +31,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
relink_command="(cd /home/thorsten/ClionProjects/RelayMQ; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=/home/thorsten/Arbeit/clion-1.2.4/bin:; export LD_LIBRARY_PATH; PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games; export PATH; gcc -std=gnu99 -Werror=format-security -g -O2 -o \$progdir/\$file src/src_node_tester-node_tester.o src/.libs/librelaymq.so -L/usr/local/lib /usr/local/lib/libczmq.so /usr/local/lib/libzmq.so -pthread -Wl,-rpath -Wl,/home/thorsten/ClionProjects/RelayMQ/src/.libs)"
relink_command="(cd /home/asetzer/git/RelayMQ; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; PATH=/usr/bin:/home/asetzer/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games; export PATH; gcc -std=gnu99 -Werror=format-security -I/home/asetzer/local/include -o \$progdir/\$file src/src_node_tester-node_tester.o -L/home/asetzer/local/lib src/.libs/librelaymq.so -luuid /home/asetzer/local/lib/libczmq.so -lzmq -pthread -Wl,-rpath -Wl,/home/asetzer/git/RelayMQ/src/.libs -Wl,-rpath -Wl,/home/asetzer/local/lib -Wl,-rpath -Wl,/home/asetzer/local/lib)"
# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
......
......@@ -631,7 +631,7 @@ relay_auth_test (bool verbose)
assert (server_cert);
zcert_t *client_cert = zcert_new ();
assert (client_cert);
char *server_key = zcert_public_txt (server_cert);
const char *server_key = zcert_public_txt (server_cert);
// Test without setting-up any authentication
zcert_apply (server_cert, server);
......@@ -683,4 +683,4 @@ relay_auth_test (bool verbose)
// @end
#endif
printf ("OK\n");
}
\ No newline at end of file
}
......@@ -56,7 +56,7 @@ s_state_new(){
static context_t*
s_context_new(zsock_t* pipe){
context_t* self = zmalloc(sizeof(context_t));
context_t* self = (context_t*) zmalloc(sizeof(context_t));
self->pipe = pipe;
self->poller = zpoller_new(self->pipe, NULL);
self->master = s_state_new();
......
......@@ -164,7 +164,7 @@ s_setup_crypto(relay_protocol_t* self, zcert_t* cert){
}
const char* uuid_string = zuuid_str(self->uuid);
char* dir = zmalloc(strlen (RMQ_DIR) + strlen (uuid_string) + 2);
char* dir = (char*) zmalloc(strlen (RMQ_DIR) + strlen (uuid_string) + 2);
strcat(dir, RMQ_DIR);
strcat(dir, uuid_string);
strcat(dir, "/");
......@@ -207,7 +207,7 @@ s_add_cert(relay_protocol_t* self, zcert_t* cert){
assert(self);
assert(cert);
char* filename= zmalloc(strlen (self->cert_location) + strlen (zcert_public_txt(cert)) + strlen(".txt"));
char* filename= (char*) zmalloc(strlen (self->cert_location) + strlen (zcert_public_txt(cert)) + strlen(".txt"));
strcat(filename, self->cert_location);
strcat(filename, zcert_public_txt(cert));
strcat(filename, ".txt");
......@@ -779,7 +779,7 @@ relay_protocol_start (relay_protocol_t *self)
self->port = zsock_bind (self->gossip, "%s", self->endpoint);
char* real_endpoint = zmalloc(strlen(self->endpoint));
char* real_endpoint = (char*) zmalloc(strlen(self->endpoint));
char *ptr;
ptr = strtok(self->endpoint, ":");
strcat(real_endpoint, ptr);
......@@ -1461,4 +1461,4 @@ relay_protocol_test (bool verbose)
printf ("OK\n");
}
\ No newline at end of file
}
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