sim: mips: move arch-specific file compilation to top-level

[binutils-gdb.git] / sim / ppc / filter.c

diff --git a/sim/ppc/filter.c b/sim/ppc/filter.c
index c901a1777f1129aca40ff85b63b123e1d4fd69cd..f1da310b1c2467227824bf8aa71b87e18d93f8d0 100644 (file)
--- a/sim/ppc/filter.c
+++ b/sim/ppc/filter.c
@@ -4,7 +4,7 @@
 
     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
+    the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -13,23 +13,16 @@
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
  
     */
 
 
 #include <stdio.h>
 
-#include "config.h"
+#include "build-config.h"
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include "misc.h"
 #include "filter.h"
@@ -47,8 +40,8 @@ new_filter(const char *filt,
   while (strlen(filt) > 0) {
     filter *new_filter;
     /* break up the filt list */
-    char *end = strchr(filt, ',');
-    char *next;
+    const char *end = strchr(filt, ',');
+    const char *next;
     int len;
     if (end == NULL) {
       end = strchr(filt, '\0');
@@ -78,8 +71,8 @@ is_filtered_out(const char *flags,
     int present;
     filter *filt = filters;
     /* break the string up */
-    char *end = strchr(flags, ',');
-    char *next;
+    const char *end = strchr(flags, ',');
+    const char *next;
     int len;
     if (end == NULL) {
       end = strchr(flags, '\0');