1
0
Fork 0
forked from len0rd/rockbox

Fix name collision on misc.h between zxbox and core.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13420 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2007-05-19 19:13:56 +00:00
parent a352c62ad0
commit 52986fb79e
9 changed files with 15 additions and 53 deletions

View file

@ -3,7 +3,7 @@ helpers.c
interf.c interf.c
keynames.c keynames.c
loadim.c loadim.c
misc.c zxmisc.c
rom_imag.c rom_imag.c
snapshot.c snapshot.c
spconf.c spconf.c

View file

@ -1,38 +0,0 @@
/*
* Copyright (C) 1996-1998 Szeredi Miklos
* Email: mszeredi@inf.bme.hu
*
* 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. See the file COPYING.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
#ifndef MISC_H
#define MISC_H
#include <sys/types.h>
extern char *get_base_name(char *fname);
extern int check_ext(const char *filename, const char *ext);
extern void add_extension(char *filename, const char *ext);
extern int file_exist(const char *filename);
extern int try_extension(char *filename, const char *ext);
extern char *spif_get_tape_fileinfo(int *startp, int *nump);
extern void *malloc_err(size_t size);
extern char *make_string(char *ostr, const char *nstr);
extern void free_string(char *ostr);
extern int mis_strcasecmp(const char *s1, const char *s2);
#endif /* MISC_H */

View file

@ -18,7 +18,7 @@
* *
*/ */
#include "misc.h" #include "zxmisc.h"
#include "helpers.h" #include "helpers.h"
#include "spperif.h" #include "spperif.h"
#include "z80.h" #include "z80.h"

View file

@ -17,7 +17,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
*/ */
#include "misc.h" #include "zxmisc.h"
#include "spconf_p.h" #include "spconf_p.h"
#include "interf.h" #include "interf.h"
#include "spscr_p.h" #include "spscr_p.h"

View file

@ -19,7 +19,7 @@
*/ */
/* #define DEBUG_KEYS */ /* #define DEBUG_KEYS */
#include "misc.h" #include "zxmisc.h"
#include "spkey.h" #include "spkey.h"
#include "spkey_p.h" #include "spkey_p.h"

View file

@ -17,7 +17,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
*/ */
#include "misc.h" #include "zxmisc.h"
#include "zxconfig.h" #include "zxconfig.h"
#include "lib/configfile.h" #include "lib/configfile.h"
#include "lib/oldmenuapi.h" #include "lib/oldmenuapi.h"

View file

@ -25,7 +25,7 @@
#include "zxconfig.h" #include "zxconfig.h"
#include "spperif.h" #include "spperif.h"
#include "z80.h" #include "z80.h"
#include "misc.h" #include "zxmisc.h"
#include "interf.h" #include "interf.h"
#include "spmain.h" #include "spmain.h"

View file

@ -17,7 +17,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
*/ */
#include "misc.h" #include "zxmisc.h"
#include "sptape.h" #include "sptape.h"
#include "tapefile.h" #include "tapefile.h"

View file

@ -18,7 +18,7 @@
* *
*/ */
#include "misc.h" #include "zxmisc.h"
#include "zxconfig.h" #include "zxconfig.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>