From ae4d79e20da996d131a437b394774338dab4efd2 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <rco@iptel.org>
Date: Fri, 8 Feb 2008 10:37:43 +0000
Subject: [PATCH] - fixed Makefile.defs (i just withdrawn one of my previous
 changes). - fixed 64 bit compiling problems.

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@698 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 Makefile.defs                                 | 6 +++---
 core/Makefile                                 | 2 +-
 core/plug-in/binrpcctrl/BrpcCtrlInterface.cpp | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile.defs b/Makefile.defs
index ce909331..927d325c 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -61,9 +61,9 @@ ifeq ($(ARCH),sparc)
 endif
 
 # need OS specific for this ?
-CXX ?= g++
-CC ?= gcc
-LD ?= $(CC)
+CXX = g++
+CC = gcc
+LD = $(CC)
 
 
 CXXFLAGS += -Wall -Wno-reorder -fPIC -g \
diff --git a/core/Makefile b/core/Makefile
index 956df87d..e54bc864 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -65,7 +65,7 @@ endif
 	$(CXX) -MM $< $(CPPFLAGS) $(CXXFLAGS) > $@
 
 $(NAME): $(NAME).o $(OBJS)
-	$(CC) -o $(NAME) $(NAME).o $(OBJS) $(LDFLAGS)
+	$(LD) -o $(NAME) $(NAME).o $(OBJS) $(LDFLAGS)
 
 install: all mk-install-dirs \
 	install-cfg \
diff --git a/core/plug-in/binrpcctrl/BrpcCtrlInterface.cpp b/core/plug-in/binrpcctrl/BrpcCtrlInterface.cpp
index cdba0d87..e5a95b01 100644
--- a/core/plug-in/binrpcctrl/BrpcCtrlInterface.cpp
+++ b/core/plug-in/binrpcctrl/BrpcCtrlInterface.cpp
@@ -705,7 +705,7 @@ bool BrpcCtrlInterface::rpcCheck()
 
   if (! (req = brpc_req(METH_CORE_VER, random()))) {
     ERROR("failed to build '%.*s' RPC context: %s [%d].\n", 
-      METH_CORE_VER.len, METH_CORE_VER.val, brpc_strerror(), brpc_errno);
+      (int)METH_CORE_VER.len, METH_CORE_VER.val, brpc_strerror(), brpc_errno);
     return false;
   }
   if (! (rpl = rpcExecute(req)))
@@ -739,7 +739,7 @@ void BrpcCtrlInterface::serResync()
   if (! ((req = brpc_req(METH_SER_RESYNC, random())) && 
       brpc_asm(req, "dsd", ASI_VERSION, &listen, serial))) {
     ERROR("failed to build '%.*s' RPC context: %s [%d].\n", 
-        METH_SER_RESYNC.len, METH_SER_RESYNC.val, brpc_strerror(), brpc_errno);
+	  (int)METH_SER_RESYNC.len, METH_SER_RESYNC.val, brpc_strerror(), brpc_errno);
     goto err;
   }
 
@@ -950,7 +950,7 @@ static enum RPC_ERR_CODE sip_fin_handler(brpc_t *brpc_req, AmSipReply &amRpl)
   for (unsigned i = 0; i < sizeof(strRef)/sizeof(string *); i ++) {
     if (cstr_refs[i])
       strRef[i]->assign(cstr_refs[i]->val, cstr_refs[i]->len - /*no 0-term*/1);
-    DBG("#%u: `%.*s'\n", i, strRef[i]->length(), strRef[i]->c_str());
+    DBG("#%u: `%.*s'\n", i, (int)strRef[i]->length(), strRef[i]->c_str());
   }
 
   enum RPC_ERR_CODE errcode;