Corrected SWIGEXPORT to SWIGIMPORT

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5412 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2003-11-25 21:51:10 +00:00
commit 3dfbcbb02c
2 changed files with 160 additions and 167 deletions

View file

@ -64,17 +64,17 @@ typedef struct swig_const_info {
#ifdef SWIG_NOINCLUDE #ifdef SWIG_NOINCLUDE
SWIGEXPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); SWIGIMPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int);
SWIGEXPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); SWIGIMPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own);
SWIGEXPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); SWIGIMPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int);
SWIGIMPORT(PyObject *) SWIG_Python_newvarlink(void);
SWIGIMPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int);
SWIGIMPORT(char *) SWIG_Python_PackData(char *c, void *, int);
SWIGIMPORT(char *) SWIG_Python_UnpackData(char *c, void *, int);
SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *);
SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]);
SWIGEXPORT(PyObject *) SWIG_Python_newvarlink(void);
SWIGEXPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
SWIGEXPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int);
SWIGEXPORT(char *) SWIG_Python_PackData(char *c, void *, int);
SWIGEXPORT(char *) SWIG_Python_UnpackData(char *c, void *, int);
SWIGEXPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *);
SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]);
#else #else
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
@ -169,8 +169,7 @@ SWIG_Python_newvarlink(void) {
} }
SWIGRUNTIME(void) SWIGRUNTIME(void)
SWIG_Python_addvarlink(PyObject *p, char *name, SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
swig_varlinkobject *v; swig_varlinkobject *v;
swig_globalvar *gv; swig_globalvar *gv;
v= (swig_varlinkobject *) p; v= (swig_varlinkobject *) p;
@ -315,8 +314,7 @@ type_error:
/* Convert a pointer value, signal an exception on a type mismatch */ /* Convert a pointer value, signal an exception on a type mismatch */
SWIGRUNTIME(void *) SWIGRUNTIME(void *)
SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) {
{
void *result; void *result;
SWIG_Python_ConvertPtr(obj, &result, ty, flags | SWIG_POINTER_EXCEPTION); SWIG_Python_ConvertPtr(obj, &result, ty, flags | SWIG_POINTER_EXCEPTION);
return result; return result;

View file

@ -110,25 +110,27 @@ typedef struct swig_instance {
#define SWIG_ObjectDelete SWIG_Tcl_ObjectDelete #define SWIG_ObjectDelete SWIG_Tcl_ObjectDelete
#ifdef SWIG_NOINCLUDE #ifdef SWIG_NOINCLUDE
SWIGEXPORT(char *) SWIG_Tcl_PackData(char *c, void *ptr, int sz);
SWIGEXPORT(char *) SWIG_Tcl_UnpackData(char *c, void *ptr, int sz); SWIGIMPORT(char *) SWIG_Tcl_PackData(char *c, void *ptr, int sz);
SWIGEXPORT(int) SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *, char *, void **, swig_type_info *,int flags); SWIGIMPORT(char *) SWIG_Tcl_UnpackData(char *c, void *ptr, int sz);
SWIGEXPORT(int) SWIG_Tcl_ConvertPtr(Tcl_Interp *, Tcl_Obj *, void **, swig_type_info *, int flags); SWIGIMPORT(int) SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *, char *, void **, swig_type_info *,int flags);
SWIGEXPORT(int) SWIG_Tcl_ConvertPacked(Tcl_Interp *, Tcl_Obj *, void *, int sz, swig_type_info *, int flags); SWIGIMPORT(int) SWIG_Tcl_ConvertPtr(Tcl_Interp *, Tcl_Obj *, void **, swig_type_info *, int flags);
SWIGEXPORT(void) SWIG_Tcl_MakePtr(char *, void *, swig_type_info *, int flags); SWIGIMPORT(int) SWIG_Tcl_ConvertPacked(Tcl_Interp *, Tcl_Obj *, void *, int sz, swig_type_info *, int flags);
SWIGEXPORT(Tcl_Obj *) SWIG_Tcl_NewPointerObj(void *, swig_type_info *, int flags); SWIGIMPORT(void) SWIG_Tcl_MakePtr(char *, void *, swig_type_info *, int flags);
SWIGEXPORT(Tcl_Obj *) SWIG_Tcl_NewPackedObj(void *, int sz, swig_type_info *, int flags); SWIGIMPORT(Tcl_Obj *) SWIG_Tcl_NewPointerObj(void *, swig_type_info *, int flags);
SWIGEXPORT(int) SWIG_Tcl_GetArgs(Tcl_Interp *, int, Tcl_Obj *CONST [], const char *, ...); SWIGIMPORT(Tcl_Obj *) SWIG_Tcl_NewPackedObj(void *, int sz, swig_type_info *, int flags);
SWIGEXPORT(char *) SWIG_Tcl_PointerTypeFromString(char *c); SWIGIMPORT(int) SWIG_Tcl_GetArgs(Tcl_Interp *, int, Tcl_Obj *CONST [], const char *, ...);
SWIGEXPORT(void) SWIG_Tcl_Acquire(void *ptr); SWIGIMPORT(char *) SWIG_Tcl_PointerTypeFromString(char *c);
SWIGEXPORT(int) SWIG_Tcl_Disown(void *ptr); SWIGIMPORT(void) SWIG_Tcl_Acquire(void *ptr);
SWIGEXPORT(int) SWIG_Tcl_Thisown(void *ptr); SWIGIMPORT(int) SWIG_Tcl_Disown(void *ptr);
SWIGEXPORT(void) SWIG_Tcl_InstallConstants(Tcl_Interp *interp, struct swig_const_info constants[]); SWIGIMPORT(int) SWIG_Tcl_Thisown(void *ptr);
SWIGEXPORT(Tcl_Obj *) SWIG_Tcl_GetConstant(const char *key); SWIGIMPORT(void) SWIG_Tcl_InstallConstants(Tcl_Interp *interp, struct swig_const_info constants[]);
SWIGEXPORT(Tcl_Obj *) SWIG_Tcl_NewInstanceObj(Tcl_Interp *interp, void *, swig_type_info *, int flags); SWIGIMPORT(Tcl_Obj *) SWIG_Tcl_GetConstant(const char *key);
SWIGEXPORT(int) SWIG_Tcl_ObjectConstructor(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]); SWIGIMPORT(Tcl_Obj *) SWIG_Tcl_NewInstanceObj(Tcl_Interp *interp, void *, swig_type_info *, int flags);
SWIGEXPORT(int) SWIG_Tcl_MethodCommand(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]); SWIGIMPORT(int) SWIG_Tcl_ObjectConstructor(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
SWIGEXPORT(void) SWIG_Tcl_ObjectDelete(ClientData); SWIGIMPORT(int) SWIG_Tcl_MethodCommand(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
SWIGIMPORT(void) SWIG_Tcl_ObjectDelete(ClientData);
#else #else
/* Object support */ /* Object support */
@ -137,8 +139,7 @@ static int swigobjectTableinit = 0;
/* Acquire ownership of a pointer */ /* Acquire ownership of a pointer */
SWIGRUNTIME(void) SWIGRUNTIME(void)
SWIG_Tcl_Acquire(void *ptr) SWIG_Tcl_Acquire(void *ptr) {
{
Tcl_HashEntry *entryPtr; Tcl_HashEntry *entryPtr;
int newobj; int newobj;
if (!swigobjectTableinit) { if (!swigobjectTableinit) {
@ -150,8 +151,7 @@ SWIG_Tcl_Acquire(void *ptr)
/* Disown a pointer. Returns 1 if we owned it to begin with */ /* Disown a pointer. Returns 1 if we owned it to begin with */
SWIGRUNTIME(int) SWIGRUNTIME(int)
SWIG_Tcl_Disown(void *ptr) SWIG_Tcl_Disown(void *ptr) {
{
Tcl_HashEntry *entryPtr; Tcl_HashEntry *entryPtr;
if (!swigobjectTableinit) return 0; if (!swigobjectTableinit) return 0;
entryPtr = Tcl_FindHashEntry(&swigobjectTable, (char *) ptr); entryPtr = Tcl_FindHashEntry(&swigobjectTable, (char *) ptr);
@ -212,8 +212,7 @@ SWIG_Tcl_UnpackData(char *c, void *ptr, int sz) {
/* Convert a pointer value */ /* Convert a pointer value */
SWIGRUNTIME(int) SWIGRUNTIME(int)
SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *interp, char *c, void **ptr, swig_type_info *ty, int flags) SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *interp, char *c, void **ptr, swig_type_info *ty, int flags) {
{
swig_type_info *tc; swig_type_info *tc;
/* Pointer values must start with leading underscore */ /* Pointer values must start with leading underscore */
while (*c != '_') { while (*c != '_') {
@ -250,8 +249,7 @@ SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *interp, char *c, void **ptr, swig_type
/* Convert a pointer value */ /* Convert a pointer value */
SWIGRUNTIME(int) SWIGRUNTIME(int)
SWIG_Tcl_ConvertPtr(Tcl_Interp *interp, Tcl_Obj *oc, void **ptr, swig_type_info *ty, int flags) SWIG_Tcl_ConvertPtr(Tcl_Interp *interp, Tcl_Obj *oc, void **ptr, swig_type_info *ty, int flags) {
{
return SWIG_Tcl_ConvertPtrFromString(interp, Tcl_GetStringFromObj(oc,NULL), ptr, ty, flags); return SWIG_Tcl_ConvertPtrFromString(interp, Tcl_GetStringFromObj(oc,NULL), ptr, ty, flags);
} }
@ -399,8 +397,7 @@ SWIG_Tcl_GetConstant(const char *key) {
/* Get arguments */ /* Get arguments */
SWIGRUNTIME(int) SWIGRUNTIME(int)
SWIG_Tcl_GetArgs(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], const char *fmt, ...) SWIG_Tcl_GetArgs(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], const char *fmt, ...) {
{
int argno = 0, opt = 0; int argno = 0, opt = 0;
long tempi; long tempi;
double tempd; double tempd;
@ -510,8 +507,7 @@ SWIG_Tcl_ObjectDelete(ClientData clientData) {
/* Function to invoke object methods given an instance */ /* Function to invoke object methods given an instance */
SWIGRUNTIME(int) SWIGRUNTIME(int)
SWIG_Tcl_MethodCommand(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST _objv[]) SWIG_Tcl_MethodCommand(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST _objv[]) {
{
char *method, *attrname; char *method, *attrname;
swig_instance *inst = (swig_instance *) clientData; swig_instance *inst = (swig_instance *) clientData;
swig_method *meth; swig_method *meth;
@ -675,8 +671,7 @@ SWIG_Tcl_MethodCommand(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_
/* Function to create objects */ /* Function to create objects */
SWIGRUNTIME(int) SWIGRUNTIME(int)
SWIG_Tcl_ObjectConstructor(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) SWIG_Tcl_ObjectConstructor(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
{
Tcl_Obj *newObj = 0; Tcl_Obj *newObj = 0;
void *thisvalue = 0; void *thisvalue = 0;
swig_instance *newinst = 0; swig_instance *newinst = 0;