Fixed some typos and added a couple of includes. All were need to get SDL_power to compile on Linux.
authorBob Pendleton <bob@pendleton.com>
Mon, 08 Jun 2009 19:24:38 +0000
changeset 3174 c8b9c6d27476
parent 3173 510e3f36c04a
child 3175 e6c113f1ea43
Fixed some typos and added a couple of includes. All were need to get SDL_power to compile on Linux. Sam, you might want to check to see that the spellings I picked are the spellings you wanted.
src/power/SDL_power.c
src/power/linux/SDL_syspower.c
--- a/src/power/SDL_power.c	Sun Jun 07 22:44:59 2009 +0000
+++ b/src/power/SDL_power.c	Mon Jun 08 19:24:38 2009 +0000
@@ -30,7 +30,7 @@
 (*SDL_GetPowerInfo_Impl)(SDL_PowerState *state, int *seconds, int *percent);
 
 SDL_bool SDL_GetPowerInfo_Linux_sys_power(SDL_PowerState*, int*, int*);
-SDL_bool SDL_GetPowerInfo_Linux_proc_apci(SDL_PowerState*, int*, int*);
+SDL_bool SDL_GetPowerInfo_Linux_proc_acpi(SDL_PowerState*, int*, int*);
 SDL_bool SDL_GetPowerInfo_Linux_proc_apm(SDL_PowerState*, int*, int*);
 SDL_bool SDL_GetPowerInfo_Windows(SDL_PowerState*, int*, int*);
 SDL_bool SDL_GetPowerInfo_MacOSX(SDL_PowerState*, int*, int*);
@@ -57,7 +57,7 @@
 #ifndef SDL_POWER_DISABLED
 #ifdef SDL_POWER_LINUX /* in order of preference. More than could work. */
     SDL_GetPowerInfo_Linux_sys_power,
-    SDL_GetPowerInfo_Linux_proc_apci,
+    SDL_GetPowerInfo_Linux_proc_acpi,
     SDL_GetPowerInfo_Linux_proc_apm,
 #endif
 #ifdef SDL_POWER_WINDOWS /* handles Win32, Win64, PocketPC. */
--- a/src/power/linux/SDL_syspower.c	Sun Jun 07 22:44:59 2009 +0000
+++ b/src/power/linux/SDL_syspower.c	Mon Jun 08 19:24:38 2009 +0000
@@ -27,6 +27,10 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #include "SDL_power.h"
 
 SDL_bool
@@ -44,8 +48,8 @@
 }
 
 SDL_bool
-SDL_GetPowerInfo_Linux_sys_proc_acpi(SDL_PowerState *state,
-                                     int *seconds, int *percent)
+SDL_GetPowerInfo_Linux_proc_acpi(SDL_PowerState *state,
+				 int *seconds, int *percent)
 {
     return SDL_FALSE;  /* !!! FIXME: write me. */
 #if 0
@@ -93,8 +97,8 @@
 
 /* http://lxr.linux.no/linux+v2.6.29/drivers/char/apm-emulation.c */
 SDL_bool
-SDL_GetPowerInfo_Linux_sys_proc_apm(SDL_PowerState *state,
-                                    int *seconds, int *percent)
+SDL_GetPowerInfo_Linux_proc_apm(SDL_PowerState *state,
+				int *seconds, int *percent)
 {
     SDL_bool need_details = SDL_FALSE;
     int ac_status = 0;