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

pedantic warnings.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3209
This commit is contained in:
Peter Veenstra 2008-08-24 16:43:06 +00:00
parent 6bc0cb78a1
commit e08ea925b7
8 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/cpu.h
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: cpu.h,v 1.54 2008-05-21 21:29:15 c2woody Exp $ */
/* $Id: cpu.h,v 1.55 2008-08-24 16:43:06 qbix79 Exp $ */
#ifndef DOSBOX_CPU_H
#define DOSBOX_CPU_H
@ -481,12 +481,12 @@ extern CPUBlock cpu;
INLINE void CPU_SetFlagsd(Bitu word) {
Bitu mask=cpu.cpl ? FMASK_NORMAL : FMASK_ALL;
CPU_SetFlags(word,mask);
};
}
INLINE void CPU_SetFlagsw(Bitu word) {
Bitu mask=(cpu.cpl ? FMASK_NORMAL : FMASK_ALL) & 0xffff;
CPU_SetFlags(word,mask);
};
}
#endif

4
include/logging.h
View file

@ -9,13 +9,13 @@ enum LOG_TYPES {
LOG_PIT,LOG_KEYBOARD,LOG_PIC,
LOG_MOUSE,LOG_BIOS,LOG_GUI,LOG_MISC,
LOG_IO,
LOG_MAX,
LOG_MAX
};
enum LOG_SEVERITIES {
LOG_NORMAL,
LOG_WARN,
LOG_ERROR,
LOG_ERROR
};
#if C_DEBUG

2
include/mapper.h
View file

@ -21,7 +21,7 @@
enum MapKeys {
MK_f1,MK_f2,MK_f3,MK_f4,MK_f5,MK_f6,MK_f7,MK_f8,MK_f9,MK_f10,MK_f11,MK_f12,
MK_return,MK_kpminus,MK_scrolllock,MK_printscreen,MK_pause,
MK_return,MK_kpminus,MK_scrolllock,MK_printscreen,MK_pause
};

24
include/mem.h
View file

@ -61,47 +61,47 @@ MemHandle MEM_NextHandleAt(MemHandle handle,Bitu where);
INLINE Bit8u host_readb(HostPt off) {
return off[0];
};
}
INLINE Bit16u host_readw(HostPt off) {
return off[0] | (off[1] << 8);
};
}
INLINE Bit32u host_readd(HostPt off) {
return off[0] | (off[1] << 8) | (off[2] << 16) | (off[3] << 24);
};
}
INLINE void host_writeb(HostPt off,Bit8u val) {
off[0]=val;
};
}
INLINE void host_writew(HostPt off,Bit16u val) {
off[0]=(Bit8u)(val);
off[1]=(Bit8u)(val >> 8);
};
}
INLINE void host_writed(HostPt off,Bit32u val) {
off[0]=(Bit8u)(val);
off[1]=(Bit8u)(val >> 8);
off[2]=(Bit8u)(val >> 16);
off[3]=(Bit8u)(val >> 24);
};
}
#else
INLINE Bit8u host_readb(HostPt off) {
return *(Bit8u *)off;
};
}
INLINE Bit16u host_readw(HostPt off) {
return *(Bit16u *)off;
};
}
INLINE Bit32u host_readd(HostPt off) {
return *(Bit32u *)off;
};
}
INLINE void host_writeb(HostPt off,Bit8u val) {
*(Bit8u *)(off)=val;
};
}
INLINE void host_writew(HostPt off,Bit16u val) {
*(Bit16u *)(off)=val;
};
}
INLINE void host_writed(HostPt off,Bit32u val) {
*(Bit32u *)(off)=val;
};
}
#endif

2
include/mixer.h
View file

@ -33,7 +33,7 @@ enum BlahModes {
enum MixerModes {
M_8M,M_8S,
M_16M,M_16S,
M_16M,M_16S
};
#define MIXER_BUFSIZE (16*1024)

2
include/regs.h
View file

@ -118,7 +118,7 @@ enum {
enum {
REGI_AL, REGI_CL, REGI_DL, REGI_BL,
REGI_AH, REGI_CH, REGI_DH, REGI_BH,
REGI_AH, REGI_CH, REGI_DH, REGI_BH
};

4
include/vga.h
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: vga.h,v 1.43 2008-08-08 21:56:36 c2woody Exp $ */
/* $Id: vga.h,v 1.44 2008-08-24 16:43:06 qbix79 Exp $ */
#ifndef DOSBOX_VGA_H
#define DOSBOX_VGA_H
@ -41,7 +41,7 @@ enum VGAModes {
M_TEXT,
M_HERC_GFX, M_HERC_TEXT,
M_CGA16, M_TANDY2, M_TANDY4, M_TANDY16, M_TANDY_TEXT,
M_ERROR,
M_ERROR
};

4
include/video.h
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: video.h,v 1.24 2008-02-21 19:25:04 c2woody Exp $ */
/* $Id: video.h,v 1.25 2008-08-24 16:43:06 qbix79 Exp $ */
#ifndef DOSBOX_VIDEO_H
#define DOSBOX_VIDEO_H
@ -26,7 +26,7 @@
typedef enum {
GFX_CallBackReset,
GFX_CallBackStop,
GFX_CallBackRedraw,
GFX_CallBackRedraw
} GFX_CallBackFunctions_t;
typedef void (*GFX_CallBack_t)( GFX_CallBackFunctions_t function );