From ea2a3ee7a8c3d0660f674de69d764d155b4d3a80 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Wed, 16 Nov 2011 10:37:48 +0000 Subject: [PATCH] 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 --- apps/gui/skin_engine/skin_parser.c | 2 ++ firmware/target/arm/ipod/piezo.c | 6 ++++-- firmware/target/arm/ipod/piezo.h | 6 ++++-- firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c | 6 ++++-- firmware/target/arm/s5l8700/ipodnano2g/piezo.h | 6 ++++-- 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 ef0f3623e8..3814029bdd 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 2c3968e79a..2b77c35309 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 78b50d0d39..9dceac13cb 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 d555b7232f..548d007780 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 b8eae0943d..987d4ffdda 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.