wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 577011 - [OS/2] make _declspec unconditionally default symbol export r=daveryeo@telus.net a=benjamin

Browse Source 
--HG--
extra : rebase_source : f73a926174bd7905f177b2e914492e42b90ac8c0
This commit is contained in:
Walter Meinl 2010-11-09 11:13:03 +01:00
parent da127e365a
commit 48d1e8997b
16 changed files with 18 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/autoconf.mk.in
View File

@ -612,7 +612,6 @@ AIX_OBJMODEL = @AIX_OBJMODEL@
# For OS/2 build
MOZ_OS2_TOOLS = @MOZ_OS2_TOOLS@
MOZ_OS2_USE_DECLSPEC = @MOZ_OS2_USE_DECLSPEC@
MOZ_OS2_HIGH_MEMORY = @MOZ_OS2_HIGH_MEMORY@
HAVE_XIE=@HAVE_XIE@

18
config/rules.mk
View File

@ -1249,26 +1249,10 @@ $(DEF_FILE): $(OBJS) $(SHARED_LIBRARY_LIBS)
echo CODE LOADONCALL MOVEABLE DISCARDABLE >> $@
echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $@
echo EXPORTS >> $@
ifeq ($(IS_COMPONENT),1)
ifeq ($(HAS_EXTRAEXPORTS),1)
ifndef MOZ_OS2_USE_DECLSPEC
$(FILTER) $(OBJS) $(SHARED_LIBRARY_LIBS) >> $@
endif
else
echo _NSModule >> $@
endif
else
ifndef MOZ_OS2_USE_DECLSPEC
$(FILTER) $(OBJS) $(SHARED_LIBRARY_LIBS) >> $@
endif
endif
$(ADD_TO_DEF_FILE)
ifdef MOZ_OS2_USE_DECLSPEC
$(IMPORT_LIBRARY): $(SHARED_LIBRARY)
else
$(IMPORT_LIBRARY): $(DEF_FILE)
endif
rm -f $@
$(IMPLIB) $@ $^
$(RANLIB) $@

8
configure.in
View File

@ -2642,7 +2642,7 @@ ia64*-hpux*)
DSO_LDOPTS='-Zdll'
BIN_FLAGS='-Zlinker /ST:0x100000'
IMPLIB='emximp -o'
FILTER='emxexp -o'
FILTER='true'
LDFLAGS='-Zmap'
WARNINGS_AS_ERRORS='-Werror'
MOZ_DEBUG_FLAGS="-g -fno-inline"
@ -2678,9 +2678,8 @@ ia64*-hpux*)
[return 0;],
ac_os2_declspec="yes",
ac_os2_declspec="no")])
if test "$ac_os2_declspec" = "yes"; then
FILTER='true'
MOZ_OS2_USE_DECLSPEC='1'
if test "$ac_os2_declspec" != "yes"; then
AC_MSG_ERROR([Compiler does not support __declspec(dllexport), install GCC-4.3.2 or newer])
fi
;;
@ -8934,7 +8933,6 @@ AC_SUBST(USE_DEPENDENT_LIBS)
AC_SUBST(MOZ_BUILD_ROOT)
AC_SUBST(MOZ_OS2_TOOLS)
AC_SUBST(MOZ_OS2_USE_DECLSPEC)
AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
AC_SUBST(MOZ_POST_PROGRAM_COMMAND)

8
gfx/cairo/cairo/src/cairo-platform.h
View File

@ -57,14 +57,8 @@
#ifdef MOZ_STATIC_BUILD
# define cairo_public
#else
# if defined(XP_WIN) || defined(XP_BEOS)
# if defined(XP_WIN) || defined(XP_BEOS) || defined(XP_OS2)
# define cairo_public extern __declspec(dllexport)
# elif defined(XP_OS2)
# ifdef __declspec
# define cairo_public extern __declspec(dllexport)
# else
# define cairo_public extern
# endif
# else
# ifdef HAVE_VISIBILITY_ATTRIBUTE
# define cairo_public extern __attribute__((visibility("default")))

1
js/src/config/autoconf.mk.in
View File

@ -305,7 +305,6 @@ AIX_OBJMODEL = @AIX_OBJMODEL@
# For OS/2 build
MOZ_OS2_TOOLS = @MOZ_OS2_TOOLS@
MOZ_OS2_USE_DECLSPEC = @MOZ_OS2_USE_DECLSPEC@
MOZ_OS2_HIGH_MEMORY = @MOZ_OS2_HIGH_MEMORY@
MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@

18
js/src/config/rules.mk
View File

@ -1249,26 +1249,10 @@ $(DEF_FILE): $(OBJS) $(SHARED_LIBRARY_LIBS)
echo CODE LOADONCALL MOVEABLE DISCARDABLE >> $@
echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $@
echo EXPORTS >> $@
ifeq ($(IS_COMPONENT),1)
ifeq ($(HAS_EXTRAEXPORTS),1)
ifndef MOZ_OS2_USE_DECLSPEC
$(FILTER) $(OBJS) $(SHARED_LIBRARY_LIBS) >> $@
endif
else
echo _NSModule >> $@
endif
else
ifndef MOZ_OS2_USE_DECLSPEC
$(FILTER) $(OBJS) $(SHARED_LIBRARY_LIBS) >> $@
endif
endif
$(ADD_TO_DEF_FILE)
ifdef MOZ_OS2_USE_DECLSPEC
$(IMPORT_LIBRARY): $(SHARED_LIBRARY)
else
$(IMPORT_LIBRARY): $(DEF_FILE)
endif
rm -f $@
$(IMPLIB) $@ $^
$(RANLIB) $@

8
js/src/configure.in
View File

@ -2332,7 +2332,7 @@ ia64*-hpux*)
DSO_LDOPTS='-Zdll'
BIN_FLAGS='-Zlinker /ST:0x100000'
IMPLIB='emximp -o'
FILTER='emxexp -o'
FILTER='true'
LDFLAGS='-Zmap'
WARNINGS_AS_ERRORS='-Werror'
MOZ_DEBUG_FLAGS="-g -fno-inline"
@ -2368,9 +2368,8 @@ ia64*-hpux*)
[return 0;],
ac_os2_declspec="yes",
ac_os2_declspec="no")])
if test "$ac_os2_declspec" = "yes"; then
FILTER='true'
MOZ_OS2_USE_DECLSPEC='1'
if test "$ac_os2_declspec" != "yes"; then
AC_MSG_ERROR([Compiler does not support __declspec(dllexport), install GCC-4.3.2 or newer])
fi
;;
@ -5143,7 +5142,6 @@ AC_SUBST(USE_DEPENDENT_LIBS)
AC_SUBST(MOZ_BUILD_ROOT)
AC_SUBST(MOZ_OS2_TOOLS)
AC_SUBST(MOZ_OS2_USE_DECLSPEC)
AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
AC_SUBST(MOZ_POST_PROGRAM_COMMAND)

13
js/src/jstypes.h
View File

@ -80,7 +80,7 @@
#define DEFINE_LOCAL_CLASS_OF_STATIC_FUNCTION(Name) class Name
#ifdef WIN32
#if defined(WIN32) || defined(XP_OS2)
/* These also work for __MWERKS__ */
# define JS_EXTERN_API(__type) extern __declspec(dllexport) __type
@ -88,13 +88,6 @@
# define JS_EXTERN_DATA(__type) extern __declspec(dllexport) __type
# define JS_EXPORT_DATA(__type) __declspec(dllexport) __type
#elif defined(XP_OS2) && defined(__declspec)
# define JS_EXTERN_API(__type) extern __declspec(dllexport) __type
# define JS_EXPORT_API(__type) __declspec(dllexport) __type
# define JS_EXTERN_DATA(__type) extern __declspec(dllexport) __type
# define JS_EXPORT_DATA(__type) __declspec(dllexport) __type
#elif defined(__SYMBIAN32__)
# define JS_EXTERN_API(__type) extern EXPORT_C __type
@ -136,7 +129,7 @@
# else
# define JS_IMPORT_API(__x) __declspec(dllimport) __x
# endif
#elif defined(XP_OS2) && defined(__declspec)
#elif defined(XP_OS2)
# define JS_IMPORT_API(__x) __declspec(dllimport) __x
#elif defined(__SYMBIAN32__)
# define JS_IMPORT_API(__x) IMPORT_C __x
@ -146,7 +139,7 @@
#if defined(_WIN32) && !defined(__MWERKS__)
# define JS_IMPORT_DATA(__x) __declspec(dllimport) __x
#elif defined(XP_OS2) && defined(__declspec)
#elif defined(XP_OS2)
# define JS_IMPORT_DATA(__x) __declspec(dllimport) __x
#elif defined(__SYMBIAN32__)
# if defined(__CW32__)

2
memory/mozalloc/mozalloc_abort.cpp
View File

@ -49,7 +49,7 @@
# include <unistd.h> // for _exit
#endif
#if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
#if defined(XP_WIN) || defined(XP_OS2)
# define MOZALLOC_EXPORT __declspec(dllexport)
#endif

2
memory/mozalloc/mozalloc_oom.cpp
View File

@ -38,7 +38,7 @@
*
* ***** END LICENSE BLOCK ***** */
#if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
#if defined(XP_WIN) || defined(XP_OS2)
# define MOZALLOC_EXPORT __declspec(dllexport)
#endif

2
memory/mozalloc/msvc_raise_wrappers.cpp
View File

@ -40,7 +40,7 @@
#include <stdio.h>
#if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
#if defined(XP_WIN) || (defined(XP_OS2)
# define MOZALLOC_EXPORT __declspec(dllexport)
#endif

2
memory/mozalloc/msvc_throw_wrapper.cpp
View File

@ -40,7 +40,7 @@
#include <exception>
#if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
#if defined(XP_WIN) || (defined(XP_OS2)
# define MOZALLOC_EXPORT __declspec(dllexport)
#endif

14
modules/zlib/src/zconf.h
View File

@ -306,19 +306,7 @@
# endif
#endif
#if defined(__OS2__) && defined(__declspec)
# ifdef ZLIB_DLL
# ifdef ZLIB_INTERNAL
# define ZEXPORT __declspec(dllexport)
# define ZEXPORTVA __declspec(dllexport)
# else
# define ZEXPORT __declspec(dllimport)
# define ZEXPORTVA __declspec(dllimport)
# endif
# endif
#endif
#if defined (__BEOS__)
#if defined(__OS2__) || defined (__BEOS__)
# ifdef ZLIB_DLL
# ifdef ZLIB_INTERNAL
# define ZEXPORT __declspec(dllexport)

4
widget/src/os2/Makefile.in
View File

@ -92,10 +92,6 @@ EXTRA_DSO_LDOPTS = \
$(QCMS_LIBS) \
$(NULL)
ifdef ENABLE_TESTS
HAS_EXTRAEXPORTS = 1
endif
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(MOZ_CAIRO_CFLAGS)

2
xpcom/base/nscore.h
View File

@ -195,7 +195,7 @@
#define NS_EXPORT_STATIC_MEMBER_(type) type
#define NS_IMPORT_STATIC_MEMBER_(type) type
#elif defined(XP_OS2) && defined(__declspec)
#elif defined(XP_OS2)
#define NS_IMPORT __declspec(dllimport)
#define NS_IMPORT_(type) type __declspec(dllimport)

4
xpcom/reflect/xptcall/src/md/os2/xptcstubs_gcc_x86_os2.cpp
View File

@ -99,12 +99,8 @@ PrepareAndDispatch(uint32 methodIndex, nsXPTCStubBase* self, PRUint32* args)
}
} // extern "C"
#if defined(__declspec)
#define SYMBOL_EXPORT(sym) \
".stabs \"" sym ",0=" sym ",code\", 0x6c,0,0,-42\n\t"
#else
#define SYMBOL_EXPORT(sym)
#endif
#define STUB_ENTRY(n) \
asm(".text\n\t" \