Remove all __DEFINE__ and __EXTERN__ macros

It seems that the condition where this macro is defined
(`#if !defined(_DLL_BLD) && defined(_dll_import)`) is never met. This
macro also seems to be meant for very specific scenario.
All in all, it seems safe to remove the macros by replacing them with
the value it gets when the above condition is not met.

diff --git a/ast_common.h.in b/ast_common.h.in
index bbb98eeae8d07864d65a3e079e4d5d0e44e99eb1..e1a1962a9d9317bc9bd83f20f4f1c94011d19eaf 100644 (file)
--- a/ast_common.h.in
+++ b/ast_common.h.in
@@ -98,14 +98,6 @@
 #endif
 #endif /*_astimport*/
 
-#if !defined(_DLL_BLD) && defined(_dll_import)
-#define __EXTERN__(T,obj)       extern T obj; T* _imp__ ## obj = &obj
-#define __DEFINE__(T,obj,val)   T obj = val; T* _imp__ ## obj = &obj
-#else
-#define __EXTERN__(T,obj)       extern T obj
-#define __DEFINE__(T,obj,val)   T obj = val
-#endif
-
 #ifndef _AST_STD_H
 #       if defined(_hdr_stddef)
 #       include <stddef.h>

diff --git a/features/common b/features/common
index 5a7d1df6136a23426dbee17125bc1b7be7e73bfa..f5a025ee47c4ba4b6ac936de344ebc84a1f7a3bb 100644 (file)
--- a/features/common
+++ b/features/common
@@ -108,16 +108,6 @@ cat{
        #endif /*_astimport*/
 }end
 
-cat{
-       #if !_DLL_BLD && _dll_import
-       #define __EXTERN__(T,obj)       extern T obj; T* _imp__ ## obj = &obj
-       #define __DEFINE__(T,obj,val)   T obj = val; T* _imp__ ## obj = &obj
-       #else
-       #define __EXTERN__(T,obj)       extern T obj
-       #define __DEFINE__(T,obj,val)   T obj = val
-       #endif
-}end
-
 cat{
        #ifndef _AST_STD_H
        #       if _hdr_stddef

diff --git a/lib/cdt/cdt.h b/lib/cdt/cdt.h
index 19dcb2512627bcc0749b672830dd7d15c2c14217..6dc99e5dab61cac92f0cec9a2a3d14aec3a23229 100644 (file)
--- a/lib/cdt/cdt.h
+++ b/lib/cdt/cdt.h
@@ -29,15 +29,6 @@
 #define __IMPORT__     __declspec (dllimport)
 #endif
 
-
-#if !defined(_DLL_BLD) && defined(_dll_import)
-#define __EXTERN__(T,obj)       extern T obj; T* _imp__ ## obj = &obj
-#define __DEFINE__(T,obj,val)   T obj = val; T* _imp__ ## obj = &obj
-#else
-#define __EXTERN__(T,obj)       extern T obj
-#define __DEFINE__(T,obj,val)   T obj = val
-#endif
-
 typedef struct _dtlink_s       Dtlink_t;
 typedef struct _dthold_s       Dthold_t;
 typedef struct _dtdisc_s       Dtdisc_t;

diff --git a/lib/cdt/dthash.c b/lib/cdt/dthash.c
index ac5359f48711f4e5f90116fb66bdb2523e06f331..8babf16138467945ad32ee2a79079240f279d1db 100644 (file)
--- a/lib/cdt/dthash.c
+++ b/lib/cdt/dthash.c
@@ -322,12 +322,12 @@ static Void_t* dthash(Dt_t* dt, reg Void_t* obj, int type)
 
 static Dtmethod_t      _Dtset = { dthash, DT_SET };
 static Dtmethod_t      _Dtbag = { dthash, DT_BAG };
-__DEFINE__(Dtmethod_t*,Dtset,&_Dtset);
-__DEFINE__(Dtmethod_t*,Dtbag,&_Dtbag);
+Dtmethod_t* Dtset = &_Dtset;
+Dtmethod_t* Dtbag = &_Dtbag;
 
 #ifndef KPVDEL /* for backward compatibility - remove next time */
 Dtmethod_t             _Dthash = { dthash, DT_SET };
-__DEFINE__(Dtmethod_t*,Dthash,&_Dthash);
+Dtmethod_t* Dthash = &_Dthash;
 #endif
 
 #ifdef NoF

diff --git a/lib/cdt/dtlist.c b/lib/cdt/dtlist.c
index 1ed726b53ace88dec323fcb92196d9aad83c0d8e..a49de2c82ea250e785eab6a03a891861e7e83dc1 100644 (file)
--- a/lib/cdt/dtlist.c
+++ b/lib/cdt/dtlist.c
@@ -175,10 +175,10 @@ static Dtmethod_t _Dtdeque  = { dtlist, DT_DEQUE  };
 static Dtmethod_t _Dtstack = { dtlist, DT_STACK };
 static Dtmethod_t _Dtqueue = { dtlist, DT_QUEUE };
 
-__DEFINE__(Dtmethod_t*,Dtlist,&_Dtlist);
-__DEFINE__(Dtmethod_t*,Dtdeque,&_Dtdeque);
-__DEFINE__(Dtmethod_t*,Dtstack,&_Dtstack);
-__DEFINE__(Dtmethod_t*,Dtqueue,&_Dtqueue);
+Dtmethod_t* Dtlist = &_Dtlist;
+Dtmethod_t* Dtdeque = &_Dtdeque;
+Dtmethod_t* Dtstack = &_Dtstack;
+Dtmethod_t* Dtqueue = &_Dtqueue;
 
 #ifdef NoF
 NoF(dtlist)

diff --git a/lib/cdt/dttree.c b/lib/cdt/dttree.c
index 87b2f0e3816b8b156c5db1a06fc490b5723e548b..cffeade48f00328ba6fadac09d3e475d54f8cd07 100644 (file)
--- a/lib/cdt/dttree.c
+++ b/lib/cdt/dttree.c
@@ -349,13 +349,13 @@ static Void_t* dttree(Dt_t* dt, Void_t* obj, int type)
 /* make this method available */
 static Dtmethod_t      _Dtoset =  { dttree, DT_OSET };
 static Dtmethod_t      _Dtobag =  { dttree, DT_OBAG };
-__DEFINE__(Dtmethod_t*,Dtoset,&_Dtoset);
-__DEFINE__(Dtmethod_t*,Dtobag,&_Dtobag);
+Dtmethod_t* Dtoset = &_Dtoset;
+Dtmethod_t* Dtobag = &_Dtobag;
 
 #ifndef KPVDEL /* backward compatibility - delete next time around */
 Dtmethod_t             _Dttree = { dttree, DT_OSET };
-__DEFINE__(Dtmethod_t*,Dtorder,&_Dttree);
-__DEFINE__(Dtmethod_t*,Dttree,&_Dttree);
+Dtmethod_t* Dtorder = &_Dttree;
+Dtmethod_t* Dttree = &_Dttree;
 #endif
 
 #ifdef NoF

diff --git a/lib/cdt/features/common b/lib/cdt/features/common
index d554c86d3adbefb5c4ced23eb10fc36b675c46ea..5c15fcb7ba972562f4baf45b378e7b9fc9f456e3 100644 (file)
--- a/lib/cdt/features/common
+++ b/lib/cdt/features/common
@@ -110,16 +110,6 @@ cat{
        #endif /*_astimport*/
 }end
 
-cat{
-       #if !_DLL_BLD && _dll_import
-       #define __EXTERN__(T,obj)       extern T obj; T* _imp__ ## obj = &obj
-       #define __DEFINE__(T,obj,val)   T obj = val; T* _imp__ ## obj = &obj
-       #else
-       #define __EXTERN__(T,obj)       extern T obj
-       #define __DEFINE__(T,obj,val)   T obj = val
-       #endif
-}end
-
 cat{
        #ifndef _AST_STD_H
        #       if _hdr_stddef

diff --git a/lib/sfio/features/common b/lib/sfio/features/common
index fce0e3593f5033f9bbac6d262bf169f0970ca9a6..7f27e5526b132d41d0e409baac8f2c7a3b949ac9 100644 (file)
--- a/lib/sfio/features/common
+++ b/lib/sfio/features/common
@@ -108,16 +108,6 @@ cat{
        #endif /*_astimport*/
 }end
 
-cat{
-       #if !_DLL_BLD && _dll_import
-       #define __EXTERN__(T,obj)       extern T obj; T* _imp__ ## obj = &obj
-       #define __DEFINE__(T,obj,val)   T obj = val; T* _imp__ ## obj = &obj
-       #else
-       #define __EXTERN__(T,obj)       extern T obj
-       #define __DEFINE__(T,obj,val)   T obj = val
-       #endif
-}end
-
 cat{
        #ifndef _AST_STD_H
        #       if _hdr_stddef

diff --git a/lib/sfio/sfextern.c b/lib/sfio/sfextern.c
index f2bf3ab95b9a640095ebba895371e7b6a04d4667..20b096ab1b5ec343f3299740b0124c8f41266c84 100644 (file)
--- a/lib/sfio/sfextern.c
+++ b/lib/sfio/sfextern.c
@@ -79,10 +79,10 @@ Sfio_t *sfstdin = &_Sfstdin;
 Sfio_t *sfstdout = &_Sfstdout;
 Sfio_t *sfstderr = &_Sfstderr;
 
-__EXTERN__(ssize_t, _Sfi);
-__EXTERN__(Sfio_t, _Sfstdin);
-__EXTERN__(Sfio_t, _Sfstdout);
-__EXTERN__(Sfio_t, _Sfstderr);
-__EXTERN__(Sfio_t *, sfstdin);
-__EXTERN__(Sfio_t *, sfstdout);
-__EXTERN__(Sfio_t *, sfstderr);
+extern ssize_t _Sfi;
+extern Sfio_t _Sfstdin;
+extern Sfio_t _Sfstdout;
+extern Sfio_t _Sfstderr;
+extern Sfio_t *sfstdin;
+extern Sfio_t *sfstdout;
+extern Sfio_t *sfstderr;

diff --git a/lib/vmalloc/features/common b/lib/vmalloc/features/common
index fce0e3593f5033f9bbac6d262bf169f0970ca9a6..7f27e5526b132d41d0e409baac8f2c7a3b949ac9 100644 (file)
--- a/lib/vmalloc/features/common
+++ b/lib/vmalloc/features/common
@@ -108,16 +108,6 @@ cat{
        #endif /*_astimport*/
 }end
 
-cat{
-       #if !_DLL_BLD && _dll_import
-       #define __EXTERN__(T,obj)       extern T obj; T* _imp__ ## obj = &obj
-       #define __DEFINE__(T,obj,val)   T obj = val; T* _imp__ ## obj = &obj
-       #else
-       #define __EXTERN__(T,obj)       extern T obj
-       #define __DEFINE__(T,obj,val)   T obj = val
-       #endif
-}end
-
 cat{
        #ifndef _AST_STD_H
        #       if _hdr_stddef

diff --git a/lib/vmalloc/vmbest.c b/lib/vmalloc/vmbest.c
index 7cff84123a2155fd2391c1803ee1c1a7de4fd676..92fb55328c93ffc85bca8da48a471d7b49a6bf4f 100644 (file)
--- a/lib/vmalloc/vmbest.c
+++ b/lib/vmalloc/vmbest.c
@@ -1179,7 +1179,7 @@ static Vmalloc_t _Vmheap = {
     NIL(Vmalloc_t *)           /* next             */
 };
 
-__DEFINE__(Vmalloc_t *, Vmheap, &_Vmheap);
-__DEFINE__(Vmalloc_t *, Vmregion, &_Vmheap);
-__DEFINE__(Vmethod_t *, Vmbest, &_Vmbest);
-__DEFINE__(Vmdisc_t *, Vmdcsbrk, &_Vmdcsbrk);
+Vmalloc_t* Vmheap = &_Vmheap;
+Vmalloc_t* Vmregion = &_Vmheap;
+Vmethod_t* Vmbest = &_Vmbest;
+Vmdisc_t* Vmdcsbrk = &_Vmdcsbrk;

diff --git a/lib/vmalloc/vmdcheap.c b/lib/vmalloc/vmdcheap.c
index 6967999a0c632f764ebf9a2116eaf61384dc7d88..1bf1f0cadf1b7d7c33359b9a2459d44b4250b9fe 100644 (file)
--- a/lib/vmalloc/vmdcheap.c
+++ b/lib/vmalloc/vmdcheap.c
@@ -40,4 +40,4 @@ static Void_t *heapmem(Vmalloc_t * vm, Void_t * caddr,
 
 static Vmdisc_t _Vmdcheap = { heapmem, NIL(Vmexcept_f), 0 };
 
-__DEFINE__(Vmdisc_t *, Vmdcheap, &_Vmdcheap);
+Vmdisc_t* Vmdcheap = &_Vmdcheap;

diff --git a/lib/vmalloc/vmdebug.c b/lib/vmalloc/vmdebug.c
index b8e0f11c3d4549357fedc8374610261d7aab0dee..05d36594a0558615a9554a1f47a4a3702536fcde 100644 (file)
--- a/lib/vmalloc/vmdebug.c
+++ b/lib/vmalloc/vmdebug.c
@@ -651,4 +651,4 @@ static Vmethod_t _Vmdebug = {
     VM_MTDEBUG
 };
 
-__DEFINE__(Vmethod_t *, Vmdebug, &_Vmdebug);
+Vmethod_t* Vmdebug = &_Vmdebug;

diff --git a/lib/vmalloc/vmlast.c b/lib/vmalloc/vmlast.c
index bd6b376e84710189319f3756f6ebee4a0e0c6cb1..c46757368e3d8341d61760edf904cdaa03498a34 100644 (file)
--- a/lib/vmalloc/vmlast.c
+++ b/lib/vmalloc/vmlast.c
@@ -396,4 +396,4 @@ static Vmethod_t _Vmlast = {
     VM_MTLAST
 };
 
-__DEFINE__(Vmethod_t *, Vmlast, &_Vmlast);
+Vmethod_t* Vmlast = &_Vmlast;

diff --git a/lib/vmalloc/vmpool.c b/lib/vmalloc/vmpool.c
index 133e57212adee3e45fd41b7423c91318081fa63e..09e6c20778e0150fbc28fb8b402af41f313b93bf 100644 (file)
--- a/lib/vmalloc/vmpool.c
+++ b/lib/vmalloc/vmpool.c
@@ -279,4 +279,4 @@ static Vmethod_t _Vmpool = {
     VM_MTPOOL
 };
 
-__DEFINE__(Vmethod_t *, Vmpool, &_Vmpool);
+Vmethod_t* Vmpool = &_Vmpool;

diff --git a/lib/vmalloc/vmprofile.c b/lib/vmalloc/vmprofile.c
index 8d8a8b657b88b3bf7f9cc4cf9eccfb8a38838cfd..38dd357c11fa78baec999af5348ab841ae59216f 100644 (file)
--- a/lib/vmalloc/vmprofile.c
+++ b/lib/vmalloc/vmprofile.c
@@ -627,4 +627,4 @@ static Vmethod_t _Vmprofile = {
     VM_MTPROFILE
 };
 
-__DEFINE__(Vmethod_t *, Vmprofile, &_Vmprofile);
+Vmethod_t* Vmprofile = &_Vmprofile;

diff --git a/windows/include/ast_common.h b/windows/include/ast_common.h
index dc03822c6bce627de0abe7f92d35f59c069b2dfb..6d552f6a901044b9b9b4768cf8851638ee3855b1 100644 (file)
--- a/windows/include/ast_common.h
+++ b/windows/include/ast_common.h
@@ -84,13 +84,6 @@
 #define _astimport     extern
 #endif
 #endif /*_astimport*/
-#if !defined(_DLL_BLD) && defined(_dll_import)
-#define __EXTERN__(T,obj)      extern T obj; T* _imp__ ## obj = &obj
-#define __DEFINE__(T,obj,val)  T obj = val; T* _imp__ ## obj = &obj
-#else
-#define __EXTERN__(T,obj)      extern T obj
-#define __DEFINE__(T,obj,val)  T obj = val
-#endif
 #ifndef _AST_STD_H
 #      if _hdr_stddef
 #      include <stddef.h>