comparison Events.cpp @ 431:8c45cac1c5e1

Merge
author Nomad
date Sun, 24 Feb 2013 00:55:51 +0200
parents 24936a5ff8ca
children e5cf03a3d98e
comparison
equal deleted inserted replaced
430:58b71c1af7d8 431:8c45cac1c5e1
31 31
32 EventIndex pSomeOtherEVT_Events[4400]; 32 EventIndex pSomeOtherEVT_Events[4400];
33 signed int uSomeOtherEVT_NumEvents; 33 signed int uSomeOtherEVT_NumEvents;
34 char *pSomeOtherEVT; 34 char *pSomeOtherEVT;
35 EventIndex pSomeEVT_Events[4400]; 35 EventIndex pSomeEVT_Events[4400];
36 unsigned int uSomeEVT_NumEvents; 36 signed int uSomeEVT_NumEvents;
37 char *pSomeEVT; 37 char *pSomeEVT;
38 38
39 unsigned int uGlobalEVT_NumEvents; 39 unsigned int uGlobalEVT_NumEvents;
40 unsigned int uGlobalEVT_Size; 40 unsigned int uGlobalEVT_Size;
41 char pGlobalEVT[46080]; 41 char pGlobalEVT[46080];
42 EventIndex pGlobalEVT_Index[4400]; 42 EventIndex pGlobalEVT_Index[4400];
43 43
44 unsigned int pLevelStrOffsets[500]; 44 unsigned int pLevelStrOffsets[500];
45 unsigned int uLevelStrNumStrings; 45 unsigned int uLevelStrNumStrings;
46 unsigned int uLevelStrFileSize; 46 unsigned int uLevelStrFileSize;
47 unsigned int uLevelEVT_NumEvents; 47 signed int uLevelEVT_NumEvents;
48 unsigned int uLevelEVT_Size; 48 unsigned int uLevelEVT_Size;
49 char pLevelStr[9216]; 49 char pLevelStr[9216];
50 char pLevelEVT[9216]; 50 char pLevelEVT[9216];
51 EventIndex pLevelEVT_Index[4400]; 51 EventIndex pLevelEVT_Index[4400];
52 52