From 89f088e0dac251879ddf038610aa238eecf2e242 Mon Sep 17 00:00:00 2001
From: "Ithamar R. Adema" <ithamar.adema@team-embedded.nl>
Date: Fri, 14 Jul 2006 21:02:30 +0000
Subject: [PATCH] More (minor) GCC 4 fixes.....

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18153 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/deskcalc/ExpressionParser.cpp   | 42 ++++++++++++------------
 src/apps/deskcalc/ExpressionTextView.cpp |  2 +-
 src/apps/processcontroller/PCWorld.cpp   |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/apps/deskcalc/ExpressionParser.cpp b/src/apps/deskcalc/ExpressionParser.cpp
index ca812cf8bc..1c51e368b9 100644
--- a/src/apps/deskcalc/ExpressionParser.cpp
+++ b/src/apps/deskcalc/ExpressionParser.cpp
@@ -365,27 +365,27 @@ static const Function kFunctions[] = {
 	{ "e",		0, NULL, M_E },
 	{ "pi",		0, NULL, M_PI },
 
-	{ "abs",	1, &fabs },
-	{ "acos",	1, &acos },
-	{ "asin",	1, &asin },
-	{ "atan",	1, &atan },
-	{ "atan2",	2, &atan2 },
-	{ "ceil",	1, &ceil },
-	{ "cos",	1, &cos },
-	{ "cosh",	1, &cosh },
-	{ "exp",	1, &exp },
-	{ "fabs",	1, &fabs },
-	{ "floor",	1, &floor },
-	{ "fmod",	2, &fmod },
-	{ "log",	1, &log },
-	{ "log10",	1, &log10 },
-	{ "pow",	2, &pow },
-	{ "sin",	1, &sin },
-	{ "sinh",	1, &sinh },
-	{ "sqrt",	1, &sqrt },
-	{ "tan",	1, &tan },
-	{ "tanh",	1, &tanh },
-	{ "hypot",	2, &hypot },
+	{ "abs",	1, (void*)&fabs },
+	{ "acos",	1, (void*)&acos },
+	{ "asin",	1, (void*)&asin },
+	{ "atan",	1, (void*)&atan },
+	{ "atan2",	2, (void*)&atan2 },
+	{ "ceil",	1, (void*)&ceil },
+	{ "cos",	1, (void*)&cos },
+	{ "cosh",	1, (void*)&cosh },
+	{ "exp",	1, (void*)&exp },
+	{ "fabs",	1, (void*)&fabs },
+	{ "floor",	1, (void*)&floor },
+	{ "fmod",	2, (void*)&fmod },
+	{ "log",	1, (void*)&log },
+	{ "log10",	1, (void*)&log10 },
+	{ "pow",	2, (void*)&pow },
+	{ "sin",	1, (void*)&sin },
+	{ "sinh",	1, (void*)&sinh },
+	{ "sqrt",	1, (void*)&sqrt },
+	{ "tan",	1, (void*)&tan },
+	{ "tanh",	1, (void*)&tanh },
+	{ "hypot",	2, (void*)&hypot },
 
 	{ NULL },
 };
diff --git a/src/apps/deskcalc/ExpressionTextView.cpp b/src/apps/deskcalc/ExpressionTextView.cpp
index 12fe3f6e7d..53ea83efe4 100644
--- a/src/apps/deskcalc/ExpressionTextView.cpp
+++ b/src/apps/deskcalc/ExpressionTextView.cpp
@@ -47,7 +47,7 @@ ExpressionTextView::~ExpressionTextView()
 
 
 void
-ExpressionTextView::MakeFocus(bool focused = true)
+ExpressionTextView::MakeFocus(bool focused)
 {
 	if (focused == IsFocus()) {
 		// stop endless loop when CalcView calls us again
diff --git a/src/apps/processcontroller/PCWorld.cpp b/src/apps/processcontroller/PCWorld.cpp
index e7491fea32..e2e1ccbc4a 100644
--- a/src/apps/processcontroller/PCWorld.cpp
+++ b/src/apps/processcontroller/PCWorld.cpp
@@ -33,7 +33,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <string.h>
 
 class PCApplication : public BApplication {
 	public: