Skip to content

Commit

Permalink
Fix some include path for Linux building. #596
Browse files Browse the repository at this point in the history
  • Loading branch information
Falk Rehwagen committed Jul 13, 2024
1 parent 28941aa commit d6e82fd
Show file tree
Hide file tree
Showing 26 changed files with 12,142 additions and 6,084 deletions.
2 changes: 1 addition & 1 deletion CInclude/Legos/Bridge/bstrmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ REVISION HISTORY:

#ifndef LIBERTY
#include <geos.h>
#include <legos/runheap.h>
#include <Legos/runheap.h>
#endif

#ifdef LIBERTY
Expand Down
162 changes: 108 additions & 54 deletions Include/Legos/Bridge/bstrmap.h
Original file line number Diff line number Diff line change
@@ -1,54 +1,108 @@
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Copyright (c) Geoworks 1995 -- All Rights Reserved
PROJECT:
MODULE:
FILE: bstrmap.h
AUTHOR: Roy Goldman, Jul 7, 1995
REVISION HISTORY:
Name Date Description
---- ---- -----------
roy 7/ 7/95 Initial version.
DESCRIPTION:
StrMap info used by both compiler and interpreter.
$Id: bstrmap.h,v 1.1 97/12/05 12:15:54 gene Exp $
$Revision: 1.1 $
Liberty version control
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
#ifndef _BSTRMAP_H_
#define _BSTRMAP_H_

#ifndef LIBERTY
#include <geos.h>
#include <legos/runheap.h>
#endif

#ifdef LIBERTY

MemHandle StrMapCreate(word size);
Boolean LStrMapAdd(MemHandle strMap, TCHAR *str);
void StrMapDestroy(MemHandle strMap);

#define StrMapAdd(strMap, rhi, str) LStrMapAdd(strMap, str)

EC(word StrMapGetCount(MemHandle strMap);)
dword StrMapGetMemoryUsedBy(MemHandle strMap);

#else /* GEOS version below */

MemHandle StrMapCreate(void);
Boolean StrMapAdd(MemHandle strMap, RunHeapInfo *rhi, TCHAR *str);
void StrMapDestroy(MemHandle strMap);
word StrMapGetCount(MemHandle strMap);

#endif

#endif /* _BSTRMAP_H_ */
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Copyright (c) Geoworks 1995 -- All Rights Reserved
PROJECT:
MODULE:
FILE: bstrmap.h
AUTHOR: Roy Goldman, Jul 7, 1995
REVISION HISTORY:
Name Date Description
---- ---- -----------
roy 7/ 7/95 Initial version.
DESCRIPTION:
StrMap info used by both compiler and interpreter.
$Id: bstrmap.h,v 1.1 97/12/05 12:15:54 gene Exp $
$Revision: 1.1 $
Liberty version control
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

#ifndef _BSTRMAP_H_

#define _BSTRMAP_H_



#ifndef LIBERTY

#include <geos.h>

#include <Legos/runheap.h>

#endif



#ifdef LIBERTY



MemHandle StrMapCreate(word size);

Boolean LStrMapAdd(MemHandle strMap, TCHAR *str);

void StrMapDestroy(MemHandle strMap);



#define StrMapAdd(strMap, rhi, str) LStrMapAdd(strMap, str)



EC(word StrMapGetCount(MemHandle strMap);)

dword StrMapGetMemoryUsedBy(MemHandle strMap);



#else /* GEOS version below */



MemHandle StrMapCreate(void);

Boolean StrMapAdd(MemHandle strMap, RunHeapInfo *rhi, TCHAR *str);

void StrMapDestroy(MemHandle strMap);

word StrMapGetCount(MemHandle strMap);



#endif



#endif /* _BSTRMAP_H_ */

Loading

0 comments on commit d6e82fd

Please sign in to comment.