bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed part of unsigned long type to uint32_t

Browse Source
This commit is contained in:
Ianos Gnatiuc
2005-10-21 02:31:39 +00:00
parent aaf04488fd
commit 6a9a1b0834
13 changed files with 130 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
goldlib/gall/gdefs.h
View File

@@ -143,6 +143,10 @@ typedef unsigned int uint;
typedef uint32_t time32_t; /* 32-bit time_t type */
// ------------------------------------------------------------------
#ifdef __cplusplus
// ------------------------------------------------------------------
// Common function-pointer types
@@ -205,6 +209,9 @@ template <class T> inline bool make_bool(T a) { return a ? true : fal
#define MinV minimum_of_two
#define MaxV maximum_of_two
// ------------------------------------------------------------------
#endif //#ifdef __cplusplus
// ------------------------------------------------------------------

2
goldlib/gall/gdirposx.h
View File

@@ -57,7 +57,7 @@ private:
std::string dirname;
gdirentry ret;
gstrarray entries;
unsigned long last_entry;
uint32_t last_entry;
public:
bool ok;

12
goldlib/gall/gfile.cpp
View File

@@ -392,17 +392,17 @@ int gfile::setvbuf(char* __buf, int __type, size_t __size) {
#ifdef __GOLDWARE_HAS_BOOL
gfile& gfile::operator>> (bool& i) { fread(&i, sizeof(bool)); return *this; }
#endif
gfile& gfile::operator>> (unsigned char& i) { fread(&i, sizeof(unsigned char)); return *this; }
gfile& gfile::operator>> (unsigned short& i) { fread(&i, sizeof(unsigned short)); return *this; }
gfile& gfile::operator>> (unsigned int& i) { unsigned int ii; fread(&ii, sizeof(unsigned int)); i = ii; return *this; }
gfile& gfile::operator>> (uint8_t& i) { fread(&i, sizeof(uint8_t)); return *this; }
gfile& gfile::operator>> (uint16_t& i) { fread(&i, sizeof(uint16_t)); return *this; }
gfile& gfile::operator>> (uint32_t& i) { fread(&i, sizeof(uint32_t)); return *this; }
gfile& gfile::operator>> (unsigned long& i) { fread(&i, sizeof(unsigned long)); return *this; }
#ifdef __GOLDWARE_HAS_BOOL
gfile& gfile::operator<< (bool o) { fwrite(&o, sizeof(o)); return *this; }
#endif
gfile& gfile::operator<< (unsigned char o) { fwrite(&o, sizeof(o)); return *this; }
gfile& gfile::operator<< (unsigned short o) { fwrite(&o, sizeof(o)); return *this; }
gfile& gfile::operator<< (unsigned int o) { fwrite(&o, sizeof(o)); return *this; }
gfile& gfile::operator<< (uint8_t o) { fwrite(&o, sizeof(o)); return *this; }
gfile& gfile::operator<< (uint16_t o) { fwrite(&o, sizeof(o)); return *this; }
gfile& gfile::operator<< (uint32_t o) { fwrite(&o, sizeof(o)); return *this; }
gfile& gfile::operator<< (unsigned long o) { fwrite(&o, sizeof(o)); return *this; }

32
goldlib/gall/gfile.h
View File

@@ -153,28 +153,28 @@ public:
#ifdef __GOLDWARE_HAS_BOOL
gfile& operator>> (bool& i);
#endif
gfile& operator>> (unsigned char& i);
gfile& operator>> (unsigned short& i);
gfile& operator>> (unsigned int& i);
gfile& operator>> (uint8_t& i);
gfile& operator>> (uint16_t& i);
gfile& operator>> (uint32_t& i);
gfile& operator>> (unsigned long& i);
gfile& operator>> (char& i) { return operator>>((unsigned char&)i); }
gfile& operator>> (signed char& i) { return operator>>((unsigned char&)i); }
gfile& operator>> (short& i) { return operator>>((unsigned short&)i); }
gfile& operator>> (int& i) { return operator>>((unsigned int&)i); }
gfile& operator>> (long& i) { return operator>>((unsigned long&)i); }
gfile& operator>> (char& i) { return operator>>((uint8_t&)i); }
gfile& operator>> (int8_t& i) { return operator>>((uint8_t&)i); }
gfile& operator>> (int16_t& i) { return operator>>((uint16_t&)i); }
gfile& operator>> (int32_t& i) { return operator>>((uint32_t&)i); }
gfile& operator>> (long& i) { return operator>>((unsigned long&)i); }
#ifdef __GOLDWARE_HAS_BOOL
gfile& operator<< (bool o);
#endif
gfile& operator<< (unsigned char o);
gfile& operator<< (unsigned short o);
gfile& operator<< (unsigned int o);
gfile& operator<< (uint8_t o);
gfile& operator<< (uint16_t o);
gfile& operator<< (uint32_t o);
gfile& operator<< (unsigned long o);
gfile& operator<< (char o) { return operator<<((unsigned char)o); }
gfile& operator<< (signed char o) { return operator<<((unsigned char)o); }
gfile& operator<< (short o) { return operator<<((unsigned short)o); }
gfile& operator<< (int o) { return operator<<((unsigned int)o); }
gfile& operator<< (long o) { return operator<<((unsigned long)o); }
gfile& operator<< (char o) { return operator<<((uint8_t )o); }
gfile& operator<< (int8_t o) { return operator<<((uint8_t )o); }
gfile& operator<< (int16_t o) { return operator<<((uint16_t)o); }
gfile& operator<< (int32_t o) { return operator<<((uint32_t)o); }
gfile& operator<< (long o) { return operator<<((unsigned long)o); }
};

4
goldlib/gall/gvidall.h
View File

@@ -256,9 +256,9 @@ struct GVidInfo {
// ------------------------------------------------------------------
#ifdef __DJGPP__
typedef unsigned long gdma; // Video DMA linear address
typedef uint32_t gdma; // Video DMA linear address
#else
typedef word* gdma; // Video DMA pointer
typedef word* gdma; // Video DMA pointer
#endif
// ------------------------------------------------------------------

4
goldlib/gall/gvidbase.cpp
View File

@@ -80,7 +80,7 @@
static bool __vcurhidden = false;
#if defined(__UNIX__) || defined(__USE_NCURSES__)
static unsigned long gvid_boxcvtc(char);
static uint32_t gvid_boxcvtc(char);
#endif
#if !defined(__USE_NCURSES__)
@@ -2094,7 +2094,7 @@ void gvid_boxcvt(char* s) {
*s++ = (char)gvid_boxcvtc(*s);
}
static unsigned long gvid_boxcvtc(char c) {
static uint32_t gvid_boxcvtc(char c) {
switch(c) {
#if 0
case '<27>': return _box_table(8, 0);