summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorPatrick Williams <iawillia@us.ibm.com>2013-04-08 14:40:21 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2013-04-17 16:56:52 -0500
commit79f790c2b9d6a368f61a99af07d04ed9348ca504 (patch)
treead13d684f026aed530be76a2266730f9a31552f4 /src/lib
parent24677286a33ea478fd5c2db959e894dd3a5f0e85 (diff)
downloadtalos-hostboot-79f790c2b9d6a368f61a99af07d04ed9348ca504.tar.gz
talos-hostboot-79f790c2b9d6a368f61a99af07d04ed9348ca504.zip
Fixes for GCC 4.7
Change-Id: Ief0b9202e13bd70cf0de84ca3cb20f5c6df4d3d8 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4035 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ctype.C46
-rw-r--r--src/lib/syscall_task.C7
2 files changed, 29 insertions, 24 deletions
diff --git a/src/lib/ctype.C b/src/lib/ctype.C
index 44e3dabeb..8ae144a5d 100644
--- a/src/lib/ctype.C
+++ b/src/lib/ctype.C
@@ -1,25 +1,27 @@
-// IBM_PROLOG_BEGIN_TAG
-// This is an automatically generated prolog.
-//
-// $Source: src/lib/ctype.C $
-//
-// IBM CONFIDENTIAL
-//
-// COPYRIGHT International Business Machines Corp. 2011
-//
-// p1
-//
-// Object Code Only (OCO) source materials
-// Licensed Internal Code Source Materials
-// IBM HostBoot Licensed Internal Code
-//
-// The source code for this program is not published or other-
-// wise divested of its trade secrets, irrespective of what has
-// been deposited with the U.S. Copyright Office.
-//
-// Origin: 30
-//
-// IBM_PROLOG_END
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/lib/ctype.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2011,2013 */
+/* */
+/* p1 */
+/* */
+/* Object Code Only (OCO) source materials */
+/* Licensed Internal Code Source Materials */
+/* IBM HostBoot Licensed Internal Code */
+/* */
+/* The source code for this program is not published or otherwise */
+/* divested of its trade secrets, irrespective of what has been */
+/* deposited with the U.S. Copyright Office. */
+/* */
+/* Origin: 30 */
+/* */
+/* IBM_PROLOG_END_TAG */
+#include <ctype.h>
+
int toupper(int ch)
{
if(( ch >= 'a') && (ch <= 'z' ))
diff --git a/src/lib/syscall_task.C b/src/lib/syscall_task.C
index 846163c8b..27272ef2e 100644
--- a/src/lib/syscall_task.C
+++ b/src/lib/syscall_task.C
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2010,2012 */
+/* COPYRIGHT International Business Machines Corp. 2010,2013 */
/* */
/* p1 */
/* */
@@ -159,7 +159,10 @@ tid_t task_wait_tid(tid_t tid, int* status, void** retval)
{
return static_cast<tid_t>(
reinterpret_cast<uint64_t>(
- _syscall3(TASK_WAIT,(void*)tid,status,retval)));
+ _syscall3(TASK_WAIT,
+ reinterpret_cast<void*>(static_cast<uint64_t>(tid)),
+ status,
+ retval)));
}
tid_t task_wait(int* status, void** retval)
OpenPOWER on IntegriCloud