From 0ae35124549a1fab117fa6631fc8adc54f0501b8 Mon Sep 17 00:00:00 2001
From: Brian McGroarty <soft@lindenlab.com>
Date: Mon, 25 Aug 2008 15:24:10 +0000
Subject: Fix gcc4 with proper Linden-canonical struct definitions
---
indra/llcommon/llfindlocale.cpp | 4 ++--
indra/llcommon/llfindlocale.h | 4 ++--
indra/llcommon/llprocessor.h | 20 ++++++++++----------
indra/llrender/llgl.h | 4 ++--
indra/llrender/llrender.h | 4 ++--
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/indra/llcommon/llfindlocale.cpp b/indra/llcommon/llfindlocale.cpp
index e9779b9399..cd9b7ddbf6 100644
--- a/indra/llcommon/llfindlocale.cpp
+++ b/indra/llcommon/llfindlocale.cpp
@@ -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 */
diff --git a/indra/llcommon/llfindlocale.h b/indra/llcommon/llfindlocale.h
index 1401609d40..cfcee759fd 100644
--- a/indra/llcommon/llfindlocale.h
+++ b/indra/llcommon/llfindlocale.h
@@ -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 */
diff --git a/indra/llcommon/llprocessor.h b/indra/llcommon/llprocessor.h
index f176478886..e4c6f590c5 100644
--- a/indra/llcommon/llprocessor.h
+++ b/indra/llcommon/llprocessor.h
@@ -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
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index f387b7b179..cff54cc342 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -318,11 +318,11 @@ public:
class LLGLNamePool
{
public:
- typedef struct
+ struct NameEntry
{
GLuint name;
BOOL used;
- } NameEntry;
+ };
struct CompareUsed
{
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 7ad2bca27c..7896f6c922 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -213,12 +213,12 @@ public:
LLTexUnit* getTexUnit(U32 index);
- typedef struct
+ struct Vertex
{
GLfloat v[3];
GLubyte c[4];
GLfloat uv[2];
- } Vertex;
+ };
public:
--
cgit v1.2.3