summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2011-11-16 10:37:48 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2011-11-16 10:37:48 +0000
commitea2a3ee7a8c3d0660f674de69d764d155b4d3a80 (patch)
tree8924b96847cec3c53ff70f8b42968f6d342ef25c
parentbe716c0be80e3f64a81a3f19b683db40489f47a1 (diff)
downloadrockbox-ea2a3ee7a8c3d0660f674de69d764d155b4d3a80.zip
rockbox-ea2a3ee7a8c3d0660f674de69d764d155b4d3a80.tar.gz
rockbox-ea2a3ee7a8c3d0660f674de69d764d155b4d3a80.tar.bz2
rockbox-ea2a3ee7a8c3d0660f674de69d764d155b4d3a80.tar.xz
Fix the gpl notice in the previous commits new files, and fix the yelow gevearts naughtily ignored
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30996 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/skin_engine/skin_parser.c2
-rw-r--r--firmware/target/arm/ipod/piezo.c6
-rw-r--r--firmware/target/arm/ipod/piezo.h6
-rw-r--r--firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c6
-rw-r--r--firmware/target/arm/s5l8700/ipodnano2g/piezo.h6
5 files changed, 18 insertions, 8 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index ef0f362..3814029 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -195,9 +195,11 @@ void *skin_find_item(const char *label, enum skin_find_what what,
while (list.linkedlist)
{
bool skip = false;
+#ifdef HAVE_LCD_BITMAP
struct wps_token *token = NULL;
if (!isvplist)
token = SKINOFFSETTOPTR(skin_buffer, list.linkedlist->token);
+#endif
switch (what)
{
case SKIN_FIND_UIVP:
diff --git a/firmware/target/arm/ipod/piezo.c b/firmware/target/arm/ipod/piezo.c
index 2c3968e..2b77c35 100644
--- a/firmware/target/arm/ipod/piezo.c
+++ b/firmware/target/arm/ipod/piezo.c
@@ -9,8 +9,10 @@
*
* Copyright (C) 2006-2007 Robert Keevil
*
- * All files in this archive are subject to the GNU General Public License.
- * See the file COPYING in the source tree root for full license agreement.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
diff --git a/firmware/target/arm/ipod/piezo.h b/firmware/target/arm/ipod/piezo.h
index 78b50d0..9dceac1 100644
--- a/firmware/target/arm/ipod/piezo.h
+++ b/firmware/target/arm/ipod/piezo.h
@@ -9,8 +9,10 @@
*
* Copyright (C) 2006-2007 Robert Keevil
*
- * All files in this archive are subject to the GNU General Public License.
- * See the file COPYING in the source tree root for full license agreement.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c
index d555b72..548d007 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c
@@ -9,8 +9,10 @@
*
* Copyright (C) 2006-2007 Robert Keevil
*
- * All files in this archive are subject to the GNU General Public License.
- * See the file COPYING in the source tree root for full license agreement.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/piezo.h b/firmware/target/arm/s5l8700/ipodnano2g/piezo.h
index b8eae09..987d4ff 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/piezo.h
+++ b/firmware/target/arm/s5l8700/ipodnano2g/piezo.h
@@ -9,8 +9,10 @@
*
* Copyright (C) 2006-2007 Robert Keevil
*
- * All files in this archive are subject to the GNU General Public License.
- * See the file COPYING in the source tree root for full license agreement.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.