Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Don't #inlcude treap.h in frame.h as only a single file within Warzone depends on the treap code 

* Use a forward declaration in strres.h to declare a pointer to a TREAP instead of importing the full treap.h declarations in strres.h and thus large portions of the codebase
 * Rename TREAP's forward declaration name from _treap to TREAP

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5543 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-07-14 15:09:00 +00:00
parent 5348e1e4ae
commit 514d96d72a
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/framework/frame.h
View File

@ -40,7 +40,6 @@
#include "debug.h" #include "debug.h"
#include "i18n.h" #include "i18n.h"
#include "treap.h"
#include "trig.h" #include "trig.h"
#include "cursors.h" #include "cursors.h"

8
lib/framework/strres.h
View File

@ -47,10 +47,10 @@ typedef struct _str_id
/* A String Resource */ /* A String Resource */
typedef struct _str_res typedef struct _str_res
{ {
TREAP *psIDTreap; // The treap to store string identifiers struct TREAP* psIDTreap; ///< The treap to store string identifiers
STR_BLOCK *psStrings; // The store for the strings themselves STR_BLOCK* psStrings; ///< The store for the strings themselves
UDWORD init,ext; // Sizes for the string blocks UDWORD init,ext; ///< Sizes for the string blocks
UDWORD nextID; // The next free ID UDWORD nextID; ///< The next free ID
} STR_RES; } STR_RES;
/* Create a string resource object */ /* Create a string resource object */

2
lib/framework/treap.h
View File

@ -74,7 +74,7 @@ typedef struct _treap_node
} TREAP_NODE; } TREAP_NODE;
/* Treap data structure */ /* Treap data structure */
typedef struct _treap typedef struct TREAP
{ {
TREAP_CMP cmp; // comparison function TREAP_CMP cmp; // comparison function
TREAP_NODE *psRoot; // root of the tree TREAP_NODE *psRoot; // root of the tree