Repair missing newlines at end of files, and remove lines of the form
#endif foo both of which upset HPUX's compiler quite a bit. Patch from Andrew Taylor <Andrew.Taylor@cal.montage.ca>.
This commit is contained in:
Родитель
5276bfad3a
Коммит
506027739d
|
@ -272,4 +272,4 @@ NS_IMETHODIMP nsHTMLFrameElement::HandleChromeEvent(nsIPresContext* aPresContext
|
|||
nsEventStatus* aEventStatus)
|
||||
{
|
||||
return HandleDOMEvent(aPresContext, aEvent, aDOMEvent, aFlags,aEventStatus);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -331,4 +331,4 @@ NS_IMETHODIMP nsHTMLIFrameElement::HandleChromeEvent(nsIPresContext* aPresContex
|
|||
nsEventStatus* aEventStatus)
|
||||
{
|
||||
return HandleDOMEvent(aPresContext, aEvent, aDOMEvent, aFlags,aEventStatus);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -45,4 +45,4 @@ public:
|
|||
|
||||
extern "C" NS_DOM nsresult NS_NewJSEventListener(nsIDOMEventListener ** aInstancePtrResult, nsIScriptContext *aContext, nsIScriptObjectOwner* aOwner);
|
||||
|
||||
#endif nsIJSEventListener_h__
|
||||
#endif // nsIJSEventListener_h__
|
||||
|
|
|
@ -61,4 +61,4 @@ class NS_NET Repeater {
|
|||
Repeater* mNextIdlr;
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -272,4 +272,4 @@ NS_IMETHODIMP nsHTMLFrameElement::HandleChromeEvent(nsIPresContext* aPresContext
|
|||
nsEventStatus* aEventStatus)
|
||||
{
|
||||
return HandleDOMEvent(aPresContext, aEvent, aDOMEvent, aFlags,aEventStatus);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -331,4 +331,4 @@ NS_IMETHODIMP nsHTMLIFrameElement::HandleChromeEvent(nsIPresContext* aPresContex
|
|||
nsEventStatus* aEventStatus)
|
||||
{
|
||||
return HandleDOMEvent(aPresContext, aEvent, aDOMEvent, aFlags,aEventStatus);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -38,4 +38,4 @@ private:
|
|||
|
||||
|
||||
|
||||
#endif // nsOEMailbox_h__
|
||||
#endif // nsOEMailbox_h__
|
||||
|
|
|
@ -80,4 +80,4 @@ private:
|
|||
nsVoidArray m_entryArray;
|
||||
};
|
||||
|
||||
#endif // nsOEScanBoxes_h__
|
||||
#endif // nsOEScanBoxes_h__
|
||||
|
|
|
@ -273,4 +273,4 @@ PRThread* nsCLoopInfo::Thread()
|
|||
nsEventLoopType nsCLoopInfo::Type()
|
||||
{
|
||||
return m_Type;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -82,4 +82,4 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* aPath)
|
|||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
return rv;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -47,4 +47,4 @@ nsGetInterface::operator()( const nsIID& aIID, void** aInstancePtr ) const
|
|||
*mErrorPtr = status;
|
||||
return status;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -1,133 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/*
|
||||
* The contents of this file are subject to the Netscape Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is Mozilla Communicator client code,
|
||||
* released March 31, 1998.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape Communications
|
||||
* Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998-1999 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Doug Turner <dougt@netscape.com>
|
||||
*/
|
||||
|
||||
|
||||
#include "nsIComponentManager.h"
|
||||
#include "nsIDirEnumeratorImpl.h"
|
||||
#include "nsIDirEnumeratorImplWin.h"
|
||||
#include "nsFileUtils.h"
|
||||
|
||||
nsIDirEnumeratorImpl::nsIDirEnumeratorImpl()
|
||||
{
|
||||
NS_INIT_REFCNT();
|
||||
mDir = nsnull;
|
||||
}
|
||||
|
||||
nsIDirEnumeratorImpl::~nsIDirEnumeratorImpl()
|
||||
{
|
||||
if (mDir)
|
||||
PR_CloseDir(mDir);
|
||||
}
|
||||
|
||||
|
||||
/* nsISupports interface implementation. */
|
||||
NS_IMPL_ISUPPORTS1(nsIDirEnumeratorImpl, nsIDirectoryEnumerator)
|
||||
|
||||
NS_METHOD
|
||||
nsIDirEnumeratorImpl::Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aInstancePtr);
|
||||
NS_ENSURE_PROPER_AGGREGATION(outer, aIID);
|
||||
|
||||
nsIDirEnumeratorImpl* inst = new nsIDirEnumeratorImpl();
|
||||
if (inst == NULL)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
nsresult rv = inst->QueryInterface(aIID, aInstancePtr);
|
||||
if (NS_FAILED(rv))
|
||||
{
|
||||
delete inst;
|
||||
return rv;
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsIDirEnumeratorImpl::Init(nsIFile *parent, PRBool resolveSymlinks)
|
||||
{
|
||||
char* filepath;
|
||||
parent->GetPath(nsIFile::NSPR_PATH, &filepath);
|
||||
|
||||
if (filepath == nsnull)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
mDir = PR_OpenDir(filepath);
|
||||
|
||||
if (mDir == nsnull) // not a directory
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
nsAllocator::Free(filepath);
|
||||
|
||||
mParent = parent;
|
||||
|
||||
mResolveSymlinks = resolveSymlinks;
|
||||
|
||||
return NS_NewFile(&mNext);
|
||||
}
|
||||
|
||||
/* boolean HasMoreElements (); */
|
||||
NS_IMETHODIMP
|
||||
nsIDirEnumeratorImpl::HasMoreElements(PRBool *result)
|
||||
{
|
||||
nsresult rv;
|
||||
*result = PR_FALSE;
|
||||
|
||||
if (mDir)
|
||||
{
|
||||
PRDirEntry* entry = PR_ReadDir(mDir, PR_SKIP_BOTH);
|
||||
if (entry == nsnull)
|
||||
return NS_OK;
|
||||
|
||||
mNext->InitWithFile(mParent);
|
||||
rv = mNext->AppendPath(entry->name);
|
||||
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
}
|
||||
*result = PR_TRUE;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
/* nsISupports GetNext (); */
|
||||
NS_IMETHODIMP
|
||||
nsIDirEnumeratorImpl::GetNext(nsISupports **_retval)
|
||||
{
|
||||
nsresult rv;
|
||||
PRBool hasMore;
|
||||
|
||||
rv = HasMoreElements(&hasMore);
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
nsIFile *file;
|
||||
rv = NS_NewFile(&file);
|
||||
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
rv = file->InitWithFile(mNext);
|
||||
|
||||
*_retval = file; // TODO: QI needed?
|
||||
return rv;
|
||||
}
|
|
@ -80,4 +80,4 @@ private:
|
|||
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -1,33 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is Mozilla Communicator client code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape Communications
|
||||
* Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*/
|
||||
|
||||
#ifndef nsBrowserCIDs_h__
|
||||
#define nsBrowserCIDs_h__
|
||||
|
||||
|
||||
// XXX: BOGUS 43147b80-8a39-11d2-9938-0080c7cb1081
|
||||
#define NS_BROWSERCONTROLLER_CID \
|
||||
{ 0x43147b80, 0x8a39, 0x11d2, \
|
||||
{0x99, 0x38, 0x00, 0x80, 0xc7, 0xcb, 0x10, 0x81} }
|
||||
|
||||
|
||||
#endif /* nsBrowserCIDs_h__ */
|
Загрузка…
Ссылка в новой задаче