mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Properly setup the import/export macros.

This commit is contained in:
ramiro%netscape.com 1999-07-16 17:46:51 +00:00
Родитель 85a0975000
Коммит 3f94005774
20 изменённых файлов: 27 добавлений и 104 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
timer/public/nsITimer.h
Просмотреть файл

@ -95,7 +95,7 @@ extern
#ifdef XP_MAC // On the macintosh, this is built into the network library.
NS_NET
#else
NS_GFX
NS_TIMER
#endif
nsresult NS_NewTimer(nsITimer** aInstancePtrResult);

2
timer/src/Makefile.in
Просмотреть файл

@ -25,7 +25,7 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
ifneq (,$(filter beos os2 rhapsody photon,$(OS_ARCH)))
DIRS = $(MOZ_GFX_TOOLKIT)
DIRS = $(MOZ_WIDGET_TOOLKIT)
else
DIRS = unix
endif

3
timer/src/beos/Makefile.in
Просмотреть файл

@ -24,12 +24,13 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
LIBRARY_NAME = timer_beos_s
LIBRARY_NAME = timer_s
MODULE=timer
REQUIRES=xpcom
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..

2
timer/src/beos/nsTimer.cpp
Просмотреть файл

@ -341,7 +341,7 @@ void TimerImpl::Cancel()
TimerImpl::sTimerManager.RemoveRequest(this);
}
NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if(nsnull == aInstancePtrResult)

2
timer/src/mac/nsTimer.cpp
Просмотреть файл

@ -342,7 +342,7 @@ void TimerPeriodical::RepeatAction( const EventRecord &inMacEvent)
}
NS_GFX nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {

3
timer/src/os2/Makefile.in
Просмотреть файл

@ -28,12 +28,13 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
LIBRARY_NAME = timer_os2_s
LIBRARY_NAME = timer_s
MODULE=timer
REQUIRES=xpcom
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..

2
timer/src/os2/nsTimerOS2.cpp
Просмотреть файл

@ -576,7 +576,7 @@ class nsTimerManagers
// Entry into the DLL. No, I dunno why there's not a normal factory
// for this either. Ease of use?
NS_BASE nsresult NS_NewTimer( nsITimer **aInstance)
NS_TIMER nsresult NS_NewTimer( nsITimer **aInstance)
{
if( !aInstance)
return NS_ERROR_NULL_POINTER;

3
timer/src/photon/Makefile.in
Просмотреть файл

@ -24,12 +24,13 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
LIBRARY_NAME = timer_photon_s
LIBRARY_NAME = timer_s
MODULE=timer
REQUIRES=xpcom
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..

2
timer/src/photon/nsTimer.cpp
Просмотреть файл

@ -246,7 +246,7 @@ int TimerImpl::TimerEventHandler( void *aData, pid_t aRcvId, void *aMsg, size_t
}
NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "NS_NewTimer - null ptr");
if (nsnull == aInstancePtrResult)

3
timer/src/rhapsody/Makefile.in
Просмотреть файл

@ -24,12 +24,13 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
LIBRARY_NAME = timer_rhapsody_s
LIBRARY_NAME = timer_s
MODULE=timer
REQUIRES=xpcom
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..

2
timer/src/rhapsody/nsTimer.cpp
Просмотреть файл

@ -177,7 +177,7 @@ TimerImpl::Cancel()
#endif
}
NS_GFX nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {

42
timer/src/unix/Makefile.in
Просмотреть файл

@ -1,42 +0,0 @@
#!gmake
#
# The contents of this file are subject to the Netscape Public License
# Version 1.0 (the "NPL"); you may not use this file except in
# compliance with the NPL. You may obtain a copy of the NPL at
# http://www.mozilla.org/NPL/
#
# Software distributed under the NPL is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
# for the specific language governing rights and limitations under the
# NPL.
#
# The Initial Developer of this code under the NPL is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
DIRS = $(MOZ_GFX_TOOLKIT)
### XXX ### DIRS = gtk motif xlib
### XXX ###
### XXX ### LIBRARY_NAME = timerutil_s
### XXX ###
### XXX ### REQUIRES=xpcom
### XXX ###
### XXX ### CPPSRCS =\
### XXX ### nsNewTimer.cpp \
### XXX ### $(NULL)
### XXX ###
### XXX ### MKSHLIB =
### XXX ### override NO_SHARED_LIB=1
### XXX ### override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk

4
timer/src/unix/gtk/Makefile.in
Просмотреть файл

@ -24,12 +24,12 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
LIBRARY_NAME = timer_gtk_s
LIBRARY_NAME = timer_s
### XXX ### IS_COMPONENT=1
REQUIRES=xpcom
### XXX ### DEFINES += -D_IMPL_NS_GFXNONXP
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..

6
timer/src/unix/gtk/nsTimerGtk.cpp
Просмотреть файл

@ -132,7 +132,7 @@ nsTimerGtk::Cancel()
if (mTimerId)
gtk_timeout_remove(mTimerId);
NS_RELEASE(me);
// NS_RELEASE(me);
}
gint nsTimerExpired(gpointer aCallData)
@ -143,8 +143,7 @@ gint nsTimerExpired(gpointer aCallData)
return 0;
}
#if 1
/* NS_GFXNONXP */ nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {
@ -158,4 +157,3 @@ gint nsTimerExpired(gpointer aCallData)
return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
}
#endif

4
timer/src/unix/motif/Makefile.in
Просмотреть файл

@ -24,12 +24,12 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
LIBRARY_NAME = timer_motif_s
LIBRARY_NAME = timer_s
### XXX ### IS_COMPONENT=1
REQUIRES=xpcom
### XXX ### DEFINES += -D_IMPL_NS_GFXNONXP
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..

20
timer/src/unix/motif/nsTimerMotif.cpp
Просмотреть файл

@ -112,30 +112,13 @@ nsTimerMotif::Cancel()
XtRemoveTimeOut(mTimerId);
}
NS_GFX nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {
return NS_ERROR_NULL_POINTER;
}
nsTimerMotif *timer = new nsTimerMotif();
if (nsnull == timer) {
return NS_ERROR_OUT_OF_MEMORY;
}
return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
}
void nsTimerExpired(XtPointer aCallData)
{
nsTimerMotif* timer = (nsTimerMotif *)aCallData;
timer->FireTimeout();
}
#if 1
/* NS_GFXNONXP */ nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {
@ -149,4 +132,3 @@ void nsTimerExpired(XtPointer aCallData)
return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
}
#endif

4
timer/src/unix/xlib/Makefile.in
Просмотреть файл

@ -24,12 +24,12 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
LIBRARY_NAME = timer_xlib_s
LIBRARY_NAME = timer_s
### XXX ### IS_COMPONENT=1
REQUIRES=xpcom
### XXX ### DEFINES += -D_IMPL_NS_GFXNONXP
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..

21
timer/src/unix/xlib/nsTimerXlib.cpp
Просмотреть файл

@ -200,23 +200,6 @@ nsTimerXlib::ProcessTimeouts(struct timeval *aNow)
}
}
#if 0
NS_GFX nsresult NS_NewTimer(nsITimer **aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {
return NS_ERROR_NULL_POINTER;
}
nsTimerXlib *timer = new nsTimerXlib();
if (nsnull == timer) {
return NS_ERROR_OUT_OF_MEMORY;
}
return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
}
#endif
int NS_TimeToNextTimeout(struct timeval *aTimer) {
nsTimerXlib *timer;
timer = nsTimerXlib::gTimerList;
@ -255,8 +238,7 @@ void NS_ProcessTimeouts(void) {
nsTimerXlib::ProcessTimeouts(&now);
}
#if 1
/* NS_GFXNONXP */ nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {
@ -270,4 +252,3 @@ void NS_ProcessTimeouts(void) {
return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
}
#endif

2
timer/src/windows/makefile.win
Просмотреть файл

@ -18,7 +18,7 @@
DEPTH=..\..\..
LIBRARY_NAME=timer_s
DEFINES=#-D_IMPL_NS_GFX -D_IMPL_NS_GFXNONXP -DWIN32_LEAN_AND_MEAN -DSTRICT
DEFINES=-D_IMPL_NS_TIMER -DWIN32_LEAN_AND_MEAN -DSTRICT
CPPSRCS = \
nsTimer.cpp \

2
timer/src/windows/nsTimer.cpp
Просмотреть файл

@ -346,7 +346,7 @@ TimerImpl::Cancel()
SyncTimeoutPeriod(0);
}
NS_GFX nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
{
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) {