Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. b71353ca0095787e8d1ed9428cdeec65230ed7e4
|
From: kosmirror <kos...@us...> - 2025-08-03 03:44:30
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".
The branch, master has been updated
via b71353ca0095787e8d1ed9428cdeec65230ed7e4 (commit)
from ac44bb4422f9c2620697cbcc3dc571b6cd88990a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b71353ca0095787e8d1ed9428cdeec65230ed7e4
Author: darc <da...@pr...>
Date: Thu May 15 22:24:31 2025 -0500
Eliminate non-standard fixed-width integer types from examples
-----------------------------------------------------------------------
Summary of changes:
examples/dreamcast/2ndmix/2ndmix.c | 45 +++++++++++-----------
examples/dreamcast/2ndmix/gfx/font14_256.h | 2 +-
.../dreamcast/basic/threading/rwsem/rwsem_test.c | 2 +-
examples/dreamcast/cpp/modplug_test/example.cpp | 8 ++--
examples/dreamcast/dreameye/basic/dreameye.c | 2 +-
examples/dreamcast/dreameye/sd/dreameye-sd.c | 4 +-
.../dreamcast/filesystem/sd/ext2fs/sd-ext2fs.c | 2 +-
examples/dreamcast/g1ata/atatest/atatest.c | 2 +-
examples/dreamcast/gldc/nehe/nehe26/nehe26.c | 2 +-
examples/dreamcast/keyboard/keytest/keytest.c | 8 ++--
.../dreamcast/kgl/basic/elements/pvr-texture.c | 4 +-
examples/dreamcast/kgl/basic/gl/pvr-texture.c | 4 +-
examples/dreamcast/kgl/basic/scissor/pvr-texture.c | 4 +-
examples/dreamcast/kgl/basic/txrenv/pvr-texture.c | 4 +-
.../dreamcast/kgl/basic/zclip_arrays/pvr-texture.c | 4 +-
examples/dreamcast/kgl/demos/blur/pvr-texture.c | 4 +-
examples/dreamcast/kgl/demos/mipmap/pvr-texture.c | 4 +-
.../kgl/demos/multitexture-arrays/pvr-texture.c | 4 +-
.../kgl/demos/multitexture-elements/pvr-texture.c | 4 +-
examples/dreamcast/kgl/demos/specular/font.c | 2 +-
examples/dreamcast/kgl/demos/specular/font.h | 4 +-
.../dreamcast/kgl/demos/specular/pvr-texture.c | 4 +-
examples/dreamcast/kgl/demos/specular/specular.c | 2 +-
examples/dreamcast/kgl/demos/specular/timer.c | 6 +--
examples/dreamcast/kgl/nehe/nehe06/pvr-texture.c | 4 +-
examples/dreamcast/kgl/nehe/nehe08/pvr-texture.c | 4 +-
examples/dreamcast/kgl/nehe/nehe09/pvr-texture.c | 4 +-
examples/dreamcast/kgl/nehe/nehe16/pvr-texture.c | 4 +-
examples/dreamcast/kgl/nehe/nehe26/nehe26.c | 2 +-
examples/dreamcast/libdream/lcd/lcd.c | 2 +-
examples/dreamcast/libdream/spu/spu.c | 2 +-
examples/dreamcast/libdream/ta/ta.c | 2 +-
examples/dreamcast/libdream/vmu/vmu.c | 22 +++++------
examples/dreamcast/lightgun/basic/lightgun.c | 2 +-
examples/dreamcast/lua/basic/lua.c | 2 +-
examples/dreamcast/mruby/dreampresent/dckos.c | 4 +-
examples/dreamcast/mruby/mrbtris/dckos.c | 4 +-
examples/dreamcast/network/ping/ping.c | 6 +--
examples/dreamcast/network/ping6/ping.c | 4 +-
examples/dreamcast/network/udpecho6/echo.c | 2 +-
.../dreamcast/parallax/delay_cube/delay_cube.c | 2 +-
examples/dreamcast/parallax/rotocube/rotocube.c | 6 +--
.../dreamcast/parallax/serpent_dma/perfmeter.c | 2 +-
examples/dreamcast/parallax/serpent_dma/serpent.c | 6 +--
examples/dreamcast/pvr/cheap_shadow/shadow.c | 2 +-
examples/dreamcast/pvr/modifier_volume/modifier.c | 2 +-
.../dreamcast/pvr/modifier_volume_tex/modifier.c | 2 +-
examples/dreamcast/pvr/plasma/plasma.c | 6 +--
.../dreamcast/pvr/texture_render/texture_render.c | 6 +--
examples/dreamcast/sound/ghettoplay-vorbis/bkg.c | 4 +-
.../dreamcast/sound/ghettoplay-vorbis/songmenu.c | 8 ++--
.../dreamcast/sound/ghettoplay-vorbis/texture.c | 6 +--
examples/dreamcast/vmu/vmu_game/vmu_game.c | 4 +-
examples/dreamcast/vmu/vmu_pkg/vmu.c | 1 -
54 files changed, 127 insertions(+), 131 deletions(-)
diff --git a/examples/dreamcast/2ndmix/2ndmix.c b/examples/dreamcast/2ndmix/2ndmix.c
index 90548f50..eac469c2 100644
--- a/examples/dreamcast/2ndmix/2ndmix.c
+++ b/examples/dreamcast/2ndmix/2ndmix.c
@@ -39,7 +39,7 @@ volatile unsigned long *snd_dbg = (unsigned long*)0xa080ffc0;
void play_s3m(char *fn) {
int idx, r;
- uint32 fd;
+ uint32_t fd;
unsigned char buffer[2048];
spu_disable();
@@ -370,25 +370,25 @@ void cubes_one_frame(void) {
a few more support bits in there before this will work fully. */
struct pcx_hdr {
- char Mfg; // manufacturer, always 0xa0
- char Ver; // encoder version number (5)
- char Enc; // encoding code, always 1
- char Bpp; // bits per pixel, 8 in mode 0x13
- uint16 Xmin, Ymin; // image origin, usually 0,0
- uint16 Xmax, Ymax; // image dimensions
- uint16 Hres; // horizontal resolution value
- uint16 Vres; // vertical resolution value
- char Pal[48]; // palette (not in mode 0x13)
- char Reserved; // who knows?
- char ClrPlanes; // number of planes, 1 in mode 0x13
- uint16 Bpl; // bytes per line, 80 in mode 0x13
- uint16 plType; // Grey or Color palette flag
- char Filler[58]; // Zsoft wanted a 128 byte header
+ char Mfg; // manufacturer, always 0xa0
+ char Ver; // encoder version number (5)
+ char Enc; // encoding code, always 1
+ char Bpp; // bits per pixel, 8 in mode 0x13
+ uint16_t Xmin, Ymin; // image origin, usually 0,0
+ uint16_t Xmax, Ymax; // image dimensions
+ uint16_t Hres; // horizontal resolution value
+ uint16_t Vres; // vertical resolution value
+ char Pal[48]; // palette (not in mode 0x13)
+ char Reserved; // who knows?
+ char ClrPlanes; // number of planes, 1 in mode 0x13
+ uint16_t Bpl; // bytes per line, 80 in mode 0x13
+ uint16_t plType; // Grey or Color palette flag
+ char Filler[58]; // Zsoft wanted a 128 byte header
};
short imageWidth, imageHeight;
-uint8 *image; /* Allocate this first */
-uint8 *pcxpal;
+uint8_t *image; /* Allocate this first */
+uint8_t *pcxpal;
char *charmap;
int load_pcx(char *pcxdata) {
@@ -732,13 +732,13 @@ void font_one_frame(void) {
void font_init(void) {
size_t x, y, c;
- uint8 pcxpall[768];
- volatile uint16 *vtex;
- uint16 val;
+ uint8_t pcxpall[768];
+ volatile uint16_t *vtex;
+ uint16_t val;
pvr_poly_cxt_t tmp;
txr_font = pvr_mem_malloc(256 * 256 * 2);
- vtex = (vuint16*)txr_font;
+ vtex = (volatile uint16_t *)txr_font;
charmap = malloc(256);
image = malloc(FONT_PIC_WIDTH * FONT_PIC_HEIGHT);
@@ -749,7 +749,7 @@ void font_init(void) {
return;
}
- printf("Drawing into 0x%08lx\r\n", (uint32)vtex);
+ printf("Drawing into 0x%08lx\r\n", (uint32_t)vtex);
for(y = 0; y < FONT_PIC_HEIGHT; y++) {
for(x = 0; x < FONT_PIC_WIDTH; x++) {
@@ -875,4 +875,3 @@ int main(int argc, const char *argv[]) {
return 0;
}
-
diff --git a/examples/dreamcast/2ndmix/gfx/font14_256.h b/examples/dreamcast/2ndmix/gfx/font14_256.h
index 5243d433..b0716a08 100644
--- a/examples/dreamcast/2ndmix/gfx/font14_256.h
+++ b/examples/dreamcast/2ndmix/gfx/font14_256.h
@@ -1,4 +1,4 @@
-uint8 font14_256_pcx[] = {
+uint8_t font14_256_pcx[] = {
10, 5, 1, 8, 0, 0, 0, 0, 255, 0, 255, 0, 44, 1, 44, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/examples/dreamcast/basic/threading/rwsem/rwsem_test.c b/examples/dreamcast/basic/threading/rwsem/rwsem_test.c
index efeccdba..e73bcfe4 100644
--- a/examples/dreamcast/basic/threading/rwsem/rwsem_test.c
+++ b/examples/dreamcast/basic/threading/rwsem/rwsem_test.c
@@ -23,7 +23,7 @@
#define UNUSED __attribute__((unused))
rw_semaphore_t s = RWSEM_INITIALIZER;
-uint32 number = 0;
+uint32_t number = 0;
void *writer0(void *param UNUSED) {
int i;
diff --git a/examples/dreamcast/cpp/modplug_test/example.cpp b/examples/dreamcast/cpp/modplug_test/example.cpp
index 55c60f2a..cb071cd0 100644
--- a/examples/dreamcast/cpp/modplug_test/example.cpp
+++ b/examples/dreamcast/cpp/modplug_test/example.cpp
@@ -2,7 +2,7 @@
#include <modplug/stdafx.h>
#include <modplug/sndfile.h>
-uint16 sound_buffer[65536] = {0};
+uint16_t sound_buffer[65536] = {0};
CSoundFile *soundfile;
void *mod_callback(snd_stream_hnd_t hnd, int len, int * actual) {
@@ -24,8 +24,8 @@ void *mod_callback(snd_stream_hnd_t hnd, int len, int * actual) {
int main(int argc, char **argv) {
maple_device_t *cont;
cont_state_t *state;
- uint8 *mod_buffer;
- uint32 hnd;
+ uint8_t *mod_buffer;
+ uint32_t hnd;
char filename[] = "/rd/test.s3m";
printf("modplug_test beginning\n");
@@ -40,7 +40,7 @@ int main(int argc, char **argv) {
}
printf("Filesize: %i\n", fs_total(hnd));
- mod_buffer = (uint8 *)malloc(fs_total(hnd));
+ mod_buffer = (uint8_t *)malloc(fs_total(hnd));
if(!mod_buffer) {
printf("Not enough memory\n");
diff --git a/examples/dreamcast/dreameye/basic/dreameye.c b/examples/dreamcast/dreameye/basic/dreameye.c
index 0dd2f997..211db314 100644
--- a/examples/dreamcast/dreameye/basic/dreameye.c
+++ b/examples/dreamcast/dreameye/basic/dreameye.c
@@ -13,7 +13,7 @@
int main(int argc, char *argv[]) {
maple_device_t *dreameye;
dreameye_state_t *state;
- uint8 *buf;
+ uint8_t *buf;
int size, err;
FILE *fp;
diff --git a/examples/dreamcast/dreameye/sd/dreameye-sd.c b/examples/dreamcast/dreameye/sd/dreameye-sd.c
index 423ebf50..68c4beb8 100644
--- a/examples/dreamcast/dreameye/sd/dreameye-sd.c
+++ b/examples/dreamcast/dreameye/sd/dreameye-sd.c
@@ -23,13 +23,13 @@
int main(int argc, char *argv[]) {
maple_device_t *dreameye;
dreameye_state_t *state;
- uint8 *buf = NULL;
+ uint8_t *buf = NULL;
int size, err;
FILE *fp;
int img_count, i;
char fn[64];
kos_blockdev_t sd_dev;
- uint8 partition_type;
+ uint8_t partition_type;
/* We're not using these, obviously... */
(void)argc;
diff --git a/examples/dreamcast/filesystem/sd/ext2fs/sd-ext2fs.c b/examples/dreamcast/filesystem/sd/ext2fs/sd-ext2fs.c
index a2de1e83..2e7a0d31 100644
--- a/examples/dreamcast/filesystem/sd/ext2fs/sd-ext2fs.c
+++ b/examples/dreamcast/filesystem/sd/ext2fs/sd-ext2fs.c
@@ -34,7 +34,7 @@
int main(int argc, char *argv[]) {
kos_blockdev_t sd_dev;
- uint8 partition_type;
+ uint8_t partition_type;
DIR *d;
struct dirent *entry;
#ifdef ENABLE_WRITE
diff --git a/examples/dreamcast/g1ata/atatest/atatest.c b/examples/dreamcast/g1ata/atatest/atatest.c
index 07e20426..f3f94f5b 100644
--- a/examples/dreamcast/g1ata/atatest/atatest.c
+++ b/examples/dreamcast/g1ata/atatest/atatest.c
@@ -27,7 +27,7 @@ static unsigned char tmp[512] __attribute__((aligned(32)));
int main(int argc, char *argv[]) {
kos_blockdev_t bd_pio, bd_dma;
- uint64 spio, epio, sdma, edma, timer;
+ uint64_t spio, epio, sdma, edma, timer;
uint8_t pt;
dbglog(DBG_DEBUG, "Starting G1 ATA test program...\n");
diff --git a/examples/dreamcast/gldc/nehe/nehe26/nehe26.c b/examples/dreamcast/gldc/nehe/nehe26/nehe26.c
index fe1e563a..779afc01 100644
--- a/examples/dreamcast/gldc/nehe/nehe26/nehe26.c
+++ b/examples/dreamcast/gldc/nehe/nehe26/nehe26.c
@@ -321,7 +321,7 @@ void draw_gl(void) {
int main(int argc, char **argv) {
maple_device_t *cont;
cont_state_t *state;
- uint16 last = CONT_A;
+ uint16_t last = CONT_A;
xrot = yrot = zrot = 0.0f;
xspeed = yspeed = zspeed = 0.0f;
diff --git a/examples/dreamcast/keyboard/keytest/keytest.c b/examples/dreamcast/keyboard/keytest/keytest.c
index 9863c8e9..1c50c0e7 100644
--- a/examples/dreamcast/keyboard/keytest/keytest.c
+++ b/examples/dreamcast/keyboard/keytest/keytest.c
@@ -26,15 +26,15 @@ Room has been explicitly left open for further tests. It might be useful to incl
#include <kos.h>
KOS_INIT_FLAGS(INIT_DEFAULT);
-extern uint16 *vram_s;
+extern uint16_t *vram_s;
cont_state_t* first_kbd_state;
maple_device_t* first_kbd_dev = NULL;
/* Track how many times we try to find a keyboard before just quitting. */
-uint8 no_kbd_loop = 0;
+uint8_t no_kbd_loop = 0;
/* This is set up to have multiple tests in the future. */
-uint8 test_phase = 0;
+uint8_t test_phase = 0;
void basic_typing (void)
@@ -42,7 +42,7 @@ void basic_typing (void)
int charcount = 0;
int rv;
int lines = 0;
- uint32 offset = ((STARTLINE+(lines*BFONT_HEIGHT)) * WIDTH);
+ uint32_t offset = ((STARTLINE+(lines*BFONT_HEIGHT)) * WIDTH);
bfont_draw_str(vram_s + offset, WIDTH, 1, "Test of basic typing. Enter 120 characters: ");
offset = ((STARTLINE+((++lines)*BFONT_HEIGHT)) * WIDTH);
diff --git a/examples/dreamcast/kgl/basic/elements/pvr-texture.c b/examples/dreamcast/kgl/basic/elements/pvr-texture.c
index d73433f3..051738ba 100644
--- a/examples/dreamcast/kgl/basic/elements/pvr-texture.c
+++ b/examples/dreamcast/kgl/basic/elements/pvr-texture.c
@@ -24,8 +24,8 @@ static GLuint PVR_TextureColor(unsigned char *HDR);
glMipMap should be passed as 1 if Open GL should calculate the Mipmap levels, 0 otherwise */
GLuint glTextureLoadPVR(char *fname, unsigned char isMipMapped, unsigned char glMipMap) {
FILE *tex = NULL;
- uint16 *TEX0 = NULL;
- uint8 HDR[PVR_HDR_SIZE];
+ uint16_t *TEX0 = NULL;
+ uint8_t HDR[PVR_HDR_SIZE];
GLuint texID, texSize, texW, texH, texFormat, texColor;
/* Open the PVR texture file, and get its file size */
diff --git a/examples/dreamcast/kgl/basic/gl/pvr-texture.c b/examples/dreamcast/kgl/basic/gl/pvr-texture.c
index d73433f3..051738ba 100644
--- a/examples/dreamcast/kgl/basic/gl/pvr-texture.c
+++ b/examples/dreamcast/kgl/basic/gl/pvr-texture.c
@@ -24,8 +24,8 @@ static GLuint PVR_TextureColor(unsigned char *HDR);
glMipMap should be passed as 1 if Open GL should calculate the Mipmap levels, 0 otherwise */
GLuint glTextureLoadPVR(char *fname, unsigned char isMipMapped, unsigned char glMipMap) {
FILE *tex = NULL;
- uint16 *TEX0 = NULL;
- uint8 HDR[PVR_HDR_SIZE];
+ uint16_t *TEX0 = NULL;
+ uint8_t HDR[PVR_HDR_SIZE];
GLuint texID, texSize, texW, texH, texFormat, texColor;
/* Open the PVR texture file, and get its file size */
diff --git a/examples/dreamcast/kgl/basic/scissor/pvr-texture.c b/examples/dreamcast/kgl/basic/scissor/pvr-texture.c
index d73433f3..051738ba 100644
--- a/examples/dreamcast/kgl/basic/scissor/pvr-texture.c
+++ b/examples/dreamcast/kgl/basic/scissor/pvr-texture.c
@@ -24,8 +24,8 @@ static GLuint PVR_TextureColor(unsigned char *HDR);
glMipMap should be passed as 1 if Open GL should calculate the Mipmap levels, 0 otherwise */
GLuint glTextureLoadPVR(char *fname, unsigned char isMipMapped, unsigned char glMipMap) {
FILE *tex = NULL;
- uint16 *TEX0 = NULL;
- uint8 HDR[PVR_HDR_SIZE];
+ uint16_t *TEX0 = NULL;
+ uint8_t HDR[PVR_HDR_SIZE];
GLuint texID, texSize, texW, texH, texFormat, texColor;
/* Open the PVR texture file, and get its file size */
diff --git a/examples/dreamcast/kgl/basic/txrenv/pvr-texture.c b/examples/dreamcast/kgl/basic/txrenv/pvr-texture.c
index d73433f3..051738ba 100644
--- a/examples/dreamcast/kgl/basic/txrenv/pvr-texture.c
+++ b/examples/dreamcast/kgl/basic/txrenv/pvr-texture.c
@@ -24,8 +24,8 @@ static GLuint PVR_TextureColor(unsigned char *HDR);
glMipMap should be passed as 1 if Open GL should calculate the Mipmap levels, 0 otherwise */
GLuint glTextureLoadPVR(char *fname, unsigned char isMipMapped, unsigned char glMipMap) {
FILE *tex = NULL;
- uint16 *TEX0 = NULL;
- uint8 HDR[PVR_HDR_SIZE];
+ uint16_t *TEX0 = NULL;
+ uint8_t HDR[PVR_HDR_SIZE];
GLuint texID, texSize, texW, texH, texFormat, texColor;
/* Open the PVR texture file, and get its file size */
diff --git a/examples/dreamcast/kgl/basic/zclip_arrays/pvr-texture.c b/examples/dreamcast/kgl/basic/zclip_arrays/pvr-texture.c
index d73433f3..051738ba 100644
--- a/examples/dreamcast/kgl/basic/zclip_arrays/pvr-texture.c
+++ b/examples/dreamcast/kgl/basic/zclip_arrays/pvr-texture.c
@@ -24,8 +24,8 @@ static GLuint PVR_TextureColor(unsigned char *HDR);
glMipMap should be passed as 1 if Open GL should calculate the Mipmap levels, 0 otherwise */
GLuint glTextureLoadPVR(char *fname, unsigned char isMipMapped, unsigned char glMipMap) {
FILE *tex = NULL;
- uint16 *TEX0 = NULL;
- uint8 HDR[PVR_HDR_SIZE];
+ uint16_t *TEX0 = NULL;
+ uint8_t HDR[PVR_HDR_SIZE];
GLuint texID, texSize, texW, texH, texFormat, texColor;
/* Open the PVR texture file, and get its file size */
diff --git a/examples/dreamcast/kgl/demos/blur/pvr-texture.c b/examples/dreamcast/kgl/demos/blur/pvr-texture.c
index 15ee4529..09e95712 100644
--- a/examples/dreamcast/kgl/demos/blur/pvr-texture.c
+++ b/examples/dreamcast/kgl/demos/blur/pvr-texture.c
@@ -24,8 +24,8 @@ static GLuint PVR_TextureColor(unsigned char *HDR);
glMipMap should be passed as 1 if Open GL should calculate the Mipmap levels, 0 otherwise */
GLuint glTextureLoadPVR(char *fname, unsigned char isMipMapped, unsigned char glMipMap) {
FILE *tex = NULL;
- uint16 *TEX0 = NULL;
- uint8 HDR[PVR_HDR_SIZE];
+ uint16_t *TEX0 = NULL;
+ uint8_t HDR[PVR_HDR_SIZE];
GLuint texID, texSize, texW, texH, texFormat, texColor;
/* Open the PVR texture file, and get its file size */
diff --git a/examples/dreamcast/kgl/demos/mipmap/pvr-texture.c b/examples/dreamcast/kgl/demos/mipmap/pvr-texture.c
index 15ee4529..09e95712 100644
--- a/examples/dreamcast/kgl/demos/mipmap/pvr-texture.c
+++ b/examples/dreamcast/kgl/demos/mipmap/pvr-texture.c
@@ -24,8 +24,8 @@ static GLuint PVR_TextureColor(unsigned char *HDR);
glMipMap should be passed as 1 if Open GL should calculate the Mipmap levels, 0 otherwise */
GLuint glTextureLoadPVR(char *fname, unsigned char isMipMapped, unsigned char glMipMap) {
FILE *tex = NULL;
- uint16 *TEX0 = NULL;
- uint8 HDR[PVR_HDR_SIZE];
+ uint16_t *TEX0 = NULL;
+ uint8_t HDR[PVR_HDR_SIZE];
GLuint texID, texSize, texW, texH, texFormat, texColor;
/* Open the PVR texture file, and get its file size */
diff --git a/examples/dreamcast/kgl/demos/multitexture-arrays/pvr-texture.c b/examples/dreamcast/kgl/demos/multitexture-arrays/pvr-texture.c
index 15ee4529..09e95712 100644
--- a/examples/dreamcast/kgl/demos/multitexture-arrays/pvr-texture.c
+++ b/examples/dreamcast/kgl/demos/multitexture-arrays/pvr-texture.c
@@ -24,8 +24,8 @@ static GLuint PVR_TextureColor(unsigned char *HDR);
glMipMap should be passed as 1 if Open GL should calculate the Mipmap levels, 0 otherwise */
GLuint glTextureLoadPVR(char *fname, unsigned char isMipMapped, unsigned char glMipMap) {
FILE *tex = NULL;
- uint16 *TEX0 = NULL;
- uint8 HDR[PVR_HDR_SIZE];
+ uint16_t *TEX0 = NULL;
+ uint8_t HDR[PVR_HDR_SIZE];
GLuint texID, texSize, texW, texH, texFormat, texColor;
/* Open the PVR texture file, and get its file size */
diff --git a/examples/dreamcast/kgl/demos/multitexture-elements/pvr-texture.c b/examples/dreamcast/kgl/demos/multitexture-elements/pvr-texture.c
index 15ee4529..09e95712 100644
--- a/examples/dreamcast/kgl/demos/multitexture-elements/pvr-texture.c
+++ b/examples/dreamcast/kgl/demos/multitexture-elements/pvr-texture.c
@@ -24,8 +24,8 @@ static GLuint PVR_TextureColor(unsigned char *HDR);
glMipMap should be passed as 1 if Open GL should calculate the Mipmap levels, 0 otherwise */
GLuint glTextureLoadPVR(char *fname, unsigned char isMipMapped, unsigned char glMipMap) {
FILE *tex = NULL;
- uint16 *TEX0 = NULL;
- uint8 HDR[PVR_HDR_SIZE];
+ uint16_t *TEX0 = NULL;
+ uint8_t HDR[PVR_HDR_SIZE];
GLuint texID, texSize, texW, texH, texFormat, texColor;
/* Open the PVR texture file, and get its file size */
diff --git a/examples/dreamcast/kgl/demos/specular/font.c b/examples/dreamcast/kgl/demos/specular/font.c
index 97bcdfe6..ede5471b 100644
--- a/examples/dreamcast/kgl/demos/specular/font.c
+++ b/examples/dreamcast/kgl/demos/specular/font.c
@@ -16,7 +16,7 @@
Font *FontInit(float TexW, float TexH,
unsigned char RowStride, unsigned char ColStride,
- uint32 Color) {
+ uint32_t Color) {
Font *font = malloc(sizeof(Font));
font->TexW = TexW;
diff --git a/examples/dreamcast/kgl/demos/specular/font.h b/examples/dreamcast/kgl/demos/specular/font.h
index b1b8ed64..5e083b9b 100644
--- a/examples/dreamcast/kgl/demos/specular/font.h
+++ b/examples/dreamcast/kgl/demos/specular/font.h
@@ -25,11 +25,11 @@ typedef struct {
Font *FontInit(float TexW, float TexH,
unsigned char RowStride, unsigned char ColStride,
- uint32 Color);
+ uint32_t Color);
void FontPrintString(Font *font, char *str, float xpos, float ypos,
float width, float height);
-void FontSetColor(Font *font, uint32 color);
+void FontSetColor(Font *font, uint32_t color);
#endif
diff --git a/examples/dreamcast/kgl/demos/specular/pvr-texture.c b/examples/dreamcast/kgl/demos/specular/pvr-texture.c
index d73433f3..051738ba 100644
--- a/examples/dreamcast/kgl/demos/specular/pvr-texture.c
+++ b/examples/dreamcast/kgl/demos/specular/pvr-texture.c
@@ -24,8 +24,8 @@ static GLuint PVR_TextureColor(unsigned char *HDR);
glMipMap should be passed as 1 if Open GL should calculate the Mipmap levels, 0 otherwise */
GLuint glTextureLoadPVR(char *fname, unsigned char isMipMapped, unsigned char glMipMap) {
FILE *tex = NULL;
- uint16 *TEX0 = NULL;
- uint8 HDR[PVR_HDR_SIZE];
+ uint16_t *TEX0 = NULL;
+ uint8_t HDR[PVR_HDR_SIZE];
GLuint texID, texSize, texW, texH, texFormat, texColor;
/* Open the PVR texture file, and get its file size */
diff --git a/examples/dreamcast/kgl/demos/specular/specular.c b/examples/dreamcast/kgl/demos/specular/specular.c
index b3a8b6c0..70fa2337 100644
--- a/examples/dreamcast/kgl/demos/specular/specular.c
+++ b/examples/dreamcast/kgl/demos/specular/specular.c
@@ -61,7 +61,7 @@ void glSetCameraPosition(vector3f campos, vector3f camdst) {
glhLookAtf2(campos, camdst, up);
}
-void draw_gl_cube(float x, float y, float z, uint32 color) {
+void draw_gl_cube(float x, float y, float z, uint32_t color) {
glPushMatrix();
glDisable(GL_LIGHTING);
diff --git a/examples/dreamcast/kgl/demos/specular/timer.c b/examples/dreamcast/kgl/demos/specular/timer.c
index 9c3cd50a..4cadee8d 100644
--- a/examples/dreamcast/kgl/demos/specular/timer.c
+++ b/examples/dreamcast/kgl/demos/specular/timer.c
@@ -7,13 +7,13 @@
#include "timer.h"
-static uint32 s, ms;
-static uint64 msec;
+static uint32_t s, ms;
+static uint64_t msec;
/* Get current hardware timing using arch/timer.h */
unsigned int GetTime(void) {
...<truncated>...
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
