Permalink
Browse files

fix for recent swig builds (#4325)

  • Loading branch information...
1 parent d7eae0b commit 4caf2bee92a3b2ccbfdb6416c5271acba46ee60c @tbonfort tbonfort committed Sep 30, 2012
Showing with 15 additions and 15 deletions.
  1. +4 −4 maperror.h
  2. +10 −10 mapserver.h
  3. +1 −1 mapsymbol.h
View
@@ -94,13 +94,13 @@ extern "C" {
#define MS_DLL_EXPORT
#endif
- typedef struct error_obj {
+ typedef struct errorObj {
int code;
char routine[ROUTINELENGTH];
char message[MESSAGELENGTH];
int isreported;
#ifndef SWIG
- struct error_obj *next;
+ struct errorObj *next;
#endif
} errorObj;
@@ -120,8 +120,8 @@ extern "C" {
MS_DLL_EXPORT char *msGetErrorCodeString(int code);
MS_DLL_EXPORT char *msAddErrorDisplayString(char *source, errorObj *error);
- struct map_obj;
- MS_DLL_EXPORT void msWriteErrorImage(struct map_obj *map, char *filename, int blank);
+ struct mapObj;
+ MS_DLL_EXPORT void msWriteErrorImage(struct mapObj *map, char *filename, int blank);
#endif /* SWIG */
View
@@ -599,7 +599,7 @@ extern "C" {
#endif
#ifndef SWIG
- struct map_obj *map;
+ struct mapObj *map;
#endif
} fontSetObj;
@@ -832,7 +832,7 @@ extern "C" {
#ifdef SWIG
%immutable;
#endif /* SWIG */
- struct map_obj *map;
+ struct mapObj *map;
#ifdef SWIG
%mutable;
#endif /* SWIG */
@@ -1056,7 +1056,7 @@ extern "C" {
/* basic symbolization and classification information */
/************************************************************************/
- typedef struct class_obj {
+ typedef struct classObj {
#ifndef SWIG
expressionObj expression; /* the expression to be matched */
#endif
@@ -1112,7 +1112,7 @@ extern "C" {
%immutable;
#endif /* SWIG */
int refcount;
- struct layer_obj *layer;
+ struct layerObj *layer;
#ifdef SWIG
%mutable;
#endif /* SWIG */
@@ -1255,7 +1255,7 @@ extern "C" {
#ifndef SWIG
int refcount;
symbolObj** symbol;
- struct map_obj *map;
+ struct mapObj *map;
fontSetObj *fontset; /* a pointer to the main mapObj version */
struct imageCacheObj *imagecache;
#endif /* not SWIG */
@@ -1279,7 +1279,7 @@ extern "C" {
#ifdef SWIG
%immutable;
#endif /* SWIG */
- struct map_obj *map;
+ struct mapObj *map;
#ifdef SWIG
%mutable;
#endif /* SWIG */
@@ -1340,7 +1340,7 @@ extern "C" {
#ifdef SWIG
%immutable;
#endif /* SWIG */
- struct map_obj *map;
+ struct mapObj *map;
#ifdef SWIG
%mutable;
#endif /* SWIG */
@@ -1443,7 +1443,7 @@ extern "C" {
/* base unit of a map. */
/************************************************************************/
- typedef struct layer_obj {
+ typedef struct layerObj {
char *classitem; /* .DBF item to be used for symbol lookup */
@@ -1467,7 +1467,7 @@ extern "C" {
int numclasses;
int maxclasses;
int index;
- struct map_obj *map;
+ struct mapObj *map;
#ifdef SWIG
%mutable;
#endif /* SWIG */
@@ -1615,7 +1615,7 @@ extern "C" {
/************************************************************************/
/* MAP OBJECT - */
- typedef struct map_obj { /* structure for a map */
+ typedef struct mapObj { /* structure for a map */
char *name; /* small identifier for naming etc. */
int status; /* is map creation on or off */
int height, width;
View
@@ -163,7 +163,7 @@ typedef struct {
/*
** Pointer to his map
*/
- struct map_obj *map;
+ struct mapObj *map;
#endif /* SWIG */
/*
** MS_SYMBOL_VECTOR and MS_SYMBOL_ELLIPSE options

0 comments on commit 4caf2be

Please sign in to comment.