зеркало из https://github.com/mozilla/gecko-dev.git
exporting classes to get julian to link with nlsstub
This commit is contained in:
Родитель
302046791c
Коммит
19d8b90980
|
@ -1,6 +1,9 @@
|
|||
#ifdef XP_PC
|
||||
#include <windows.h>
|
||||
|
||||
#ifndef MOZ_TREX
|
||||
#include "nlsloc.h"
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
BOOL WINAPI DllMain (HINSTANCE hDLL, DWORD dwReason, LPVOID lpReserved)
|
||||
|
@ -17,7 +20,10 @@ BOOL WINAPI DllMain (HINSTANCE hDLL, DWORD dwReason, LPVOID lpReserved)
|
|||
break;
|
||||
|
||||
case DLL_PROCESS_DETACH:
|
||||
|
||||
#ifndef MOZ_TREX
|
||||
NLS_Terminate();
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ LIBDIR=libjulian
|
|||
|
||||
LIBRARY_NAME = juls$(MOZ_BITS)$(VERSION_NUMBER)
|
||||
|
||||
LCFLAGS= -DLIBJULIAN $(LCFLAGS)
|
||||
LCFLAGS= -DLIBJULIAN $(LCFLAGS)
|
||||
|
||||
DLLNAME = jul$(MOZ_BITS)$(VERSION_NUMBER)
|
||||
PDBFILE = $(DLLNAME).pdb
|
||||
|
@ -41,7 +41,11 @@ MAKE_OBJ_TYPE = DLL
|
|||
|
||||
include <$(NS_DEPTH)/config/config.mak>
|
||||
|
||||
REQUIRES=nls
|
||||
!ifdef MOZ_TREX
|
||||
CFLAGS = $(CFLAGS) -I$(PUBLIC)\public\raptor -I$(PUBLIC)\public\xpcom -DMOZ_TREX
|
||||
!endif
|
||||
|
||||
REQUIRES=nls raptor xpcom
|
||||
|
||||
OBJS = $(OBJS) \
|
||||
!ifndef MOZ_TREX
|
||||
|
@ -145,7 +149,7 @@ LLIBS = $(LLIBS) \
|
|||
!endif
|
||||
$(NULL)
|
||||
|
||||
LINCS=-I$(XPDIST)\public\nls
|
||||
#LINCS=-I$(XPDIST)\public\nls -I$(PUBLIC)\public\raptor -I$(PUBLIC)\public\xpcom
|
||||
|
||||
#// From the old Manifest file
|
||||
CSRCS=julmain.c
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
class TimeZone;
|
||||
class ParsePosition;
|
||||
|
||||
class Calendar
|
||||
class NS_NLS Calendar
|
||||
{
|
||||
|
||||
public:
|
||||
|
|
|
@ -26,7 +26,7 @@ class ParsePosition;
|
|||
class Format;
|
||||
class TimeZone;
|
||||
|
||||
class DateFormat
|
||||
class NS_NLS DateFormat
|
||||
{
|
||||
|
||||
public:
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
class TimeZone;
|
||||
class Locale;
|
||||
|
||||
class GregorianCalendar : public Calendar
|
||||
class NS_NLS GregorianCalendar : public Calendar
|
||||
{
|
||||
|
||||
public:
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
class UnicodeString;
|
||||
|
||||
class Locale
|
||||
class NS_NLS Locale
|
||||
{
|
||||
|
||||
public:
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
typedef PRUint32 NLS_ThreadInfo;
|
||||
typedef PRUint32 NLS_ErrorCode;
|
||||
|
||||
NLS_ErrorCode NLS_Initialize(const NLS_ThreadInfo * aThreadInfo, const char * aDataDirectory);
|
||||
NLS_ErrorCode NLS_Terminate(void);
|
||||
NLS_ErrorCode NS_NLS NLS_Initialize(const NLS_ThreadInfo * aThreadInfo, const char * aDataDirectory);
|
||||
NLS_ErrorCode NS_NLS NLS_Terminate(void);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "ptypes.h"
|
||||
|
||||
class ParsePosition
|
||||
class NS_NLS ParsePosition
|
||||
{
|
||||
|
||||
public:
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#ifndef ptypes_h__
|
||||
#define ptypes_h__
|
||||
|
||||
#include "nscore.h"
|
||||
#include "nspr.h"
|
||||
|
||||
typedef double Date;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "timezone.h"
|
||||
|
||||
class SimpleTimeZone : public TimeZone
|
||||
class NS_NLS SimpleTimeZone : public TimeZone
|
||||
{
|
||||
|
||||
public:
|
||||
|
|
|
@ -27,7 +27,7 @@ class Formattable;
|
|||
class ParsePosition;
|
||||
class Format;
|
||||
|
||||
class FieldPosition
|
||||
class NS_NLS FieldPosition
|
||||
{
|
||||
public:
|
||||
FieldPosition();
|
||||
|
@ -35,7 +35,7 @@ public:
|
|||
FieldPosition(PRInt32 aField);
|
||||
};
|
||||
|
||||
class SimpleDateFormat : public DateFormat
|
||||
class NS_NLS SimpleDateFormat : public DateFormat
|
||||
{
|
||||
public:
|
||||
SimpleDateFormat();
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
class UnicodeString;
|
||||
|
||||
class TimeZone
|
||||
class NS_NLS TimeZone
|
||||
{
|
||||
|
||||
public:
|
||||
|
|
Загрузка…
Ссылка в новой задаче