Fix gcc4 with proper Linden-canonical struct definitions

master
Brian McGroarty 2008-08-25 15:24:10 +00:00
parent cb7abfd595
commit 0ae3512454
5 changed files with 18 additions and 18 deletions

View File

@ -180,10 +180,10 @@ canonise_fl(FL_Locale *l) {
#define ML(pn,sn) MAKELANGID(LANG_##pn, SUBLANG_##pn##_##sn)
#define MLN(pn) MAKELANGID(LANG_##pn, SUBLANG_DEFAULT)
#define RML(pn,sn) MAKELANGID(LANG_##pn, SUBLANG_##sn)
typedef struct {
struct IDToCode {
LANGID id;
char* code;
} IDToCode;
};
static const IDToCode both_to_code[] = {
{ML(ENGLISH,US), "en_US.ISO_8859-1"},
{ML(ENGLISH,CAN), "en_CA"}, /* english / canadian */

View File

@ -36,11 +36,11 @@ typedef const char* FL_Lang;
typedef const char* FL_Country;
typedef const char* FL_Variant;
typedef struct {
struct FL_Locale {
FL_Lang lang;
FL_Country country;
FL_Variant variant;
} FL_Locale;
};
typedef enum {
/* for some reason we failed to even guess: this should never happen */

View File

@ -58,7 +58,7 @@
#endif
typedef struct
struct ProcessorExtensions
{
bool FPU_FloatingPointUnit;
bool VME_Virtual8086ModeEnhancements;
@ -97,9 +97,9 @@ typedef struct
bool _3DNOW_InstructionExtensions;
bool _E3DNOW_InstructionExtensions;
bool AA64_AMD64BitArchitecture;
} ProcessorExtensions;
};
typedef struct
struct ProcessorCache
{
bool bPresent;
char strSize[32]; /* Flawfinder: ignore */
@ -107,24 +107,24 @@ typedef struct
unsigned int uiLineSize;
bool bSectored;
char strCache[128]; /* Flawfinder: ignore */
} ProcessorCache;
};
typedef struct
struct ProcessorL1Cache
{
ProcessorCache Instruction;
ProcessorCache Data;
} ProcessorL1Cache;
};
typedef struct
struct ProcessorTLB
{
bool bPresent;
char strPageSize[32]; /* Flawfinder: ignore */
unsigned int uiAssociativeWays;
unsigned int uiEntries;
char strTLB[128]; /* Flawfinder: ignore */
} ProcessorTLB;
};
typedef struct
struct ProcessorInfo
{
char strVendor[16]; /* Flawfinder: ignore */
unsigned int uiFamily;
@ -148,7 +148,7 @@ typedef struct
ProcessorCache _Trace;
ProcessorTLB _Instruction;
ProcessorTLB _Data;
} ProcessorInfo;
};
// CProcessor

View File

@ -318,11 +318,11 @@ public:
class LLGLNamePool
{
public:
typedef struct
struct NameEntry
{
GLuint name;
BOOL used;
} NameEntry;
};
struct CompareUsed
{

View File

@ -213,12 +213,12 @@ public:
LLTexUnit* getTexUnit(U32 index);
typedef struct
struct Vertex
{
GLfloat v[3];
GLubyte c[4];
GLfloat uv[2];
} Vertex;
};
public: