# 25555
r= edburns@acm.org OS/2 changes for Mozilla - add #ifdef, change #ifdef git-svn-id: svn://10.0.0.236/trunk@63048 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -66,9 +66,20 @@
|
||||
******************************************************************************/
|
||||
|
||||
/* DLL Entry modifiers... */
|
||||
|
||||
#if defined(XP_OS2)
|
||||
# ifdef XP_OS2_VACPP
|
||||
# define JNI_PUBLIC_API(ResultType) ResultType _System
|
||||
# define JNI_PUBLIC_VAR(VarType) VarType
|
||||
# define JNICALL
|
||||
# define JNIEXPORT
|
||||
# else
|
||||
# define JNI_PUBLIC_API(ResultType) ResultType
|
||||
# define JNI_PUBLIC_VAR(VarType) VarType
|
||||
# define JNICALL
|
||||
# define JNIEXPORT
|
||||
# endif
|
||||
/* PC */
|
||||
#if defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
|
||||
#elif defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
|
||||
# include <windows.h>
|
||||
# if defined(_MSC_VER)
|
||||
# if defined(WIN32) || defined(_WIN32)
|
||||
|
||||
@@ -53,7 +53,17 @@ extern "C" {
|
||||
/* DLL Entry modifiers... */
|
||||
|
||||
/* PC */
|
||||
#if defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
|
||||
#if defined(XP_OS2)
|
||||
# ifdef XP_OS2_VACPP
|
||||
# define JRI_PUBLIC_API(ResultType) ResultType _Optlink
|
||||
# define JRI_PUBLIC_VAR(VarType) VarType
|
||||
# define JRI_CALLBACK
|
||||
# else
|
||||
# define JRI_PUBLIC_API(ResultType) ResultType
|
||||
# define JRI_PUBLIC_VAR(VarType) VarType
|
||||
# define JRI_CALLBACK
|
||||
# endif
|
||||
#elif defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
|
||||
# include <windows.h>
|
||||
# if defined(_MSC_VER)
|
||||
# if defined(WIN32) || defined(_WIN32)
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#ifndef SYSMACROS_MD_H_
|
||||
#define SYSMACROS_MD_H_
|
||||
|
||||
#if defined(XP_PC) && !defined(_WIN32)
|
||||
#if defined (XP_PC) && !defined (_WIN32) && !defined (XP_OS2)
|
||||
#ifndef HUGEP
|
||||
#define HUGEP __huge
|
||||
#endif
|
||||
@@ -30,6 +30,7 @@
|
||||
#ifndef HUGEP
|
||||
#define HUGEP
|
||||
#endif
|
||||
#endif /* defined(XP_PC) && !defined(_WIN32) */
|
||||
#endif /* defined(XP_PC) && !defined (_WIN32) && !defined (XP_OS2) */
|
||||
|
||||
|
||||
#endif /*SYSMACROS_MD_H_*/
|
||||
|
||||
Reference in New Issue
Block a user