Module Name: src Committed By: macallan Date: Thu Jul 28 15:29:52 UTC 2011
Modified Files: src/sys/arch/macppc/macppc: machdep.c Log Message: appease gcc 4.5 To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 src/sys/arch/macppc/macppc/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/macppc/macppc/machdep.c diff -u src/sys/arch/macppc/macppc/machdep.c:1.161 src/sys/arch/macppc/macppc/machdep.c:1.162 --- src/sys/arch/macppc/macppc/machdep.c:1.161 Wed Jul 13 22:54:33 2011 +++ src/sys/arch/macppc/macppc/machdep.c Thu Jul 28 15:29:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.161 2011/07/13 22:54:33 macallan Exp $ */ +/* $NetBSD: machdep.c,v 1.162 2011/07/28 15:29:52 macallan Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.161 2011/07/13 22:54:33 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.162 2011/07/28 15:29:52 macallan Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -347,7 +347,7 @@ gpc_backlight.gpc_set_parameter = of_set_backlight; gpc_backlight.gpc_get_parameter = of_get_backlight; gpc_backlight.gpc_upd_parameter = NULL; - backlight_cb = (uint64_t)&gpc_backlight; + backlight_cb = (uint64_t)(uintptr_t)&gpc_backlight; prop_dictionary_set_uint64(dict, "backlight_callback", backlight_cb); @@ -355,7 +355,7 @@ gpc_brightness.gpc_set_parameter = of_set_brightness; gpc_brightness.gpc_get_parameter = of_get_brightness; gpc_brightness.gpc_upd_parameter = of_upd_brightness; - brightness_cb = (uint64_t)&gpc_brightness; + brightness_cb = (uint64_t)(uintptr_t)&gpc_brightness; prop_dictionary_set_uint64(dict, "brightness_callback", brightness_cb); }