* 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-861f7616d084master
parent
5348e1e4ae
commit
514d96d72a
|
@ -40,7 +40,6 @@
|
|||
#include "debug.h"
|
||||
|
||||
#include "i18n.h"
|
||||
#include "treap.h"
|
||||
#include "trig.h"
|
||||
#include "cursors.h"
|
||||
|
||||
|
|
|
@ -47,10 +47,10 @@ typedef struct _str_id
|
|||
/* A String Resource */
|
||||
typedef struct _str_res
|
||||
{
|
||||
TREAP *psIDTreap; // The treap to store string identifiers
|
||||
STR_BLOCK *psStrings; // The store for the strings themselves
|
||||
UDWORD init,ext; // Sizes for the string blocks
|
||||
UDWORD nextID; // The next free ID
|
||||
struct TREAP* psIDTreap; ///< The treap to store string identifiers
|
||||
STR_BLOCK* psStrings; ///< The store for the strings themselves
|
||||
UDWORD init,ext; ///< Sizes for the string blocks
|
||||
UDWORD nextID; ///< The next free ID
|
||||
} STR_RES;
|
||||
|
||||
/* Create a string resource object */
|
||||
|
|
|
@ -74,7 +74,7 @@ typedef struct _treap_node
|
|||
} TREAP_NODE;
|
||||
|
||||
/* Treap data structure */
|
||||
typedef struct _treap
|
||||
typedef struct TREAP
|
||||
{
|
||||
TREAP_CMP cmp; // comparison function
|
||||
TREAP_NODE *psRoot; // root of the tree
|
||||
|
|
Loading…
Reference in New Issue