Add part of patch 1235377 of msharov and fix a few small bugs in the return values of the cpu cores
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2593
This commit is contained in:
parent
49870fee9c
commit
132bbffb68
13 changed files with 46 additions and 46 deletions
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: programs.cpp,v 1.25 2006-04-10 12:06:07 qbix79 Exp $ */
|
||||
/* $Id: programs.cpp,v 1.26 2006-04-11 19:02:33 qbix79 Exp $ */
|
||||
|
||||
#include <vector>
|
||||
#include <ctype.h>
|
||||
|
@ -51,7 +51,7 @@ static Bit8u exe_block[]={
|
|||
|
||||
static std::vector<PROGRAMS_Main*> internal_progs;
|
||||
|
||||
void PROGRAMS_MakeFile(char * name,PROGRAMS_Main * main) {
|
||||
void PROGRAMS_MakeFile(char const * const name,PROGRAMS_Main * main) {
|
||||
Bit8u * comdata=(Bit8u *)malloc(32); //MEM LEAK
|
||||
memcpy(comdata,&exe_block,sizeof(exe_block));
|
||||
comdata[CB_POS]=call_program&0xff;
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: support.cpp,v 1.29 2006-02-09 11:47:57 qbix79 Exp $ */
|
||||
/* $Id: support.cpp,v 1.30 2006-04-11 19:02:33 qbix79 Exp $ */
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
@ -65,7 +65,7 @@ char *trim(char *str) {
|
|||
}
|
||||
|
||||
|
||||
bool ScanCMDBool(char * cmd,char * check) {
|
||||
bool ScanCMDBool(char * cmd,char const * const check) {
|
||||
char * scan=cmd;size_t c_len=strlen(check);
|
||||
while ((scan=strchr(scan,'/'))) {
|
||||
/* found a / now see behind it */
|
||||
|
@ -145,7 +145,7 @@ double ConvDblWord(char * word) {
|
|||
|
||||
|
||||
static char buf[1024]; //greater scope as else it doesn't always gets thrown right (linux/gcc2.95)
|
||||
void E_Exit(char * format,...) {
|
||||
void E_Exit(const char * format,...) {
|
||||
#if C_DEBUG && C_HEAVY_DEBUG
|
||||
DEBUG_HeavyWriteLogInstruction();
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue