diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0728f8e893..57c6ff12be 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-24 18:27 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/bin/hb-func.sh + * reverted modification for import attributes - this will be changed + in the future to function calls + 2008-09-24 18:17 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbdoc/hbdoc.prg * utils/hbmake/hbmake.prg diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index 6502e865be..a75250dd3e 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -428,6 +428,7 @@ for gt in \${HB_GT_REQ}; do done [ -n "\${HB_FM_REQ}" ] && HB_LNK_REQ="\${HB_LNK_REQ} HB_FM_\${HB_FM_REQ}" +HB_LNK_ATTR="" HARBOUR_LIBS="" if [ "\${HB_STATIC}" = "yes" ]; then libs="${hb_libs} ${hb_libsc}" @@ -440,6 +441,7 @@ else elif [ "\${HB_ARCHITECTURE}" = "w32" ]; then pref="" ext=".dll" + HB_LNK_ATTR="__attribute__ ((dllimport))" elif [ "\${HB_ARCHITECTURE}" = "hpux" ]; then pref="lib" ext=".sl" @@ -594,8 +596,8 @@ hb_lnk_request() if [ -n "\$gt" ] || [ -n "\${HB_MAIN_FUNC}" ]; then echo "#include \\"hbinit.h\\"" echo "HB_EXTERN_BEGIN" - echo "extern HB_IMPORT const char * hb_gt_szNameDefault;" - echo "extern HB_IMPORT const char * hb_vm_pszLinkedMain;" + echo "extern \${HB_LNK_ATTR} const char * hb_gt_szNameDefault;" + echo "extern \${HB_LNK_ATTR} const char * hb_vm_pszLinkedMain;" echo "HB_EXTERN_END" echo "HB_CALL_ON_STARTUP_BEGIN( hb_lnk_SetDefault_build )" if [ -n "\$gt" ]; then