valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Add part of patch 1235377 of msharov and fix a few small bugs in the return values of the cpu cores

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2593
This commit is contained in:
Peter Veenstra 2006-04-11 19:02:33 +00:00
parent 49870fee9c
commit 132bbffb68
13 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gui/render_simple.h
View file

@ -29,7 +29,7 @@ static void conc4d(SCALERNAME,SBPP,DBPP,R)(const void *s) {
Bitu hadChange = 0;
#if (SBPP == 9)
for (Bits x=render.src.width;x>0;) {
if (*(Bit32u*)src == *(Bit32u*)cache && !(
if (*(Bit32u const*)src == *(Bit32u*)cache && !(
render.pal.modified[src[0]] |
render.pal.modified[src[1]] |
render.pal.modified[src[2]] |
@ -40,7 +40,7 @@ static void conc4d(SCALERNAME,SBPP,DBPP,R)(const void *s) {
line0+=4*SCALERWIDTH;
#else
for (Bits x=render.src.width;x>0;) {
if (*(Bitu*)src == *(Bitu*)cache) {
if (*(Bitu const*)src == *(Bitu*)cache) {
x-=(sizeof(Bitu)/sizeof(SRCTYPE));
src+=(sizeof(Bitu)/sizeof(SRCTYPE));
cache+=(sizeof(Bitu)/sizeof(SRCTYPE));

2
src/gui/render_templates.h
View file

@ -129,7 +129,7 @@ static void conc3d(Cache,SBPP,DBPP) (const void * s) {
if (pixel != fc[x]) {
#else
for (Bitu x=0;x<SCALER_BLOCKSIZE;x+=sizeof(Bitu)/sizeof(SRCTYPE)) {
if (*(Bitu*)&src[x] != *(Bitu*)&sc[x]) {
if (*(Bitu const*)&src[x] != *(Bitu*)&sc[x]) {
#endif
do {
fc[x] = PMAKE(src[x]);

4
src/gui/sdlmain.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: sdlmain.cpp,v 1.113 2006-03-29 12:26:07 qbix79 Exp $ */
/* $Id: sdlmain.cpp,v 1.114 2006-04-11 19:02:33 qbix79 Exp $ */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
@ -1216,7 +1216,7 @@ void GFX_Events() {
* Fixes some bugs when -noconsole is used in a read only directory */
static bool no_stdout = false;
void GFX_ShowMsg(char * format,...) {
void GFX_ShowMsg(char const* format,...) {
char buf[512];
va_list msg;
va_start(msg,format);