[PATCH 5/5] include: Remove now unnecessary registration ifdefs.

[Rémi Bernon]

From: Rémi Bernon

---
 include/windows.foundation.idl      | 12 ------------
 include/windows.storage.streams.idl | 10 ----------
 2 files changed, 22 deletions(-)

diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl
index d6b96175b2d..f4c1ea2800e 100644
--- a/include/windows.foundation.idl
+++ b/include/windows.foundation.idl
@@ -125,22 +125,16 @@ namespace Windows.Foundation {
         interface Windows.Foundation.Collections.IIterable<HSTRING>;
         interface Windows.Foundation.Collections.IIterable<IInspectable *>;
         interface Windows.Foundation.Collections.IIterable<IWwwFormUrlDecoderEntry *>;
-#ifndef _WINTYPES
         interface Windows.Foundation.Collections.IIterable<Uri *>;
-#endif
         interface Windows.Foundation.Collections.IIterator<HSTRING>;
         interface Windows.Foundation.Collections.IIterator<IInspectable *>;
         interface Windows.Foundation.Collections.IIterator<IWwwFormUrlDecoderEntry *>;
-#ifndef _WINTYPES
         interface Windows.Foundation.Collections.IIterator<Uri *>;
-#endif
         interface Windows.Foundation.Collections.IVectorView<BYTE>;
         interface Windows.Foundation.Collections.IVectorView<HSTRING>;
         interface Windows.Foundation.Collections.IVectorView<IInspectable *>;
         interface Windows.Foundation.Collections.IVectorView<IWwwFormUrlDecoderEntry *>;
-#ifndef _WINTYPES
         interface Windows.Foundation.Collections.IVectorView<Windows.Foundation.Uri *>;
-#endif
         interface Windows.Foundation.Collections.IVector<HSTRING>;
         interface Windows.Foundation.Collections.IVector<IInspectable *>;
         interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING> *>;
@@ -150,18 +144,14 @@ namespace Windows.Foundation {
         interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>;
         interface Windows.Foundation.AsyncOperationCompletedHandler<HSTRING>;
         interface Windows.Foundation.AsyncOperationCompletedHandler<UINT32>;
-#ifndef _WINTYPES
         interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Uri *>;
-#endif
         interface Windows.Foundation.AsyncOperationProgressHandler<UINT32, UINT32>;
         interface Windows.Foundation.AsyncOperationWithProgressCompletedHandler<UINT32, UINT32>;
         interface Windows.Foundation.IAsyncOperation<HSTRING>;
         interface Windows.Foundation.IAsyncOperation<IInspectable *>;
         interface Windows.Foundation.IAsyncOperation<boolean>;
         interface Windows.Foundation.IAsyncOperation<UINT32>;
-#ifndef _WINTYPES
         interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Uri *>;
-#endif
         interface Windows.Foundation.IAsyncOperationWithProgress<UINT32, UINT32>;
         interface Windows.Foundation.IReference<BYTE>;
         interface Windows.Foundation.IReference<DOUBLE>;
@@ -588,7 +578,6 @@ namespace Windows.Foundation {
     {
     }

-#ifndef _WINTYPES
     [
         activatable(Windows.Foundation.IUriRuntimeClassFactory, Windows.Foundation.UniversalApiContract, 1.0),
         contract(Windows.Foundation.UniversalApiContract, 1.0),
@@ -615,7 +604,6 @@ namespace Windows.Foundation {
         interface Windows.Foundation.Collections.IVectorView<Windows.Foundation.IWwwFormUrlDecoderEntry *>;
         interface Windows.Foundation.Collections.IIterable<Windows.Foundation.IWwwFormUrlDecoderEntry *>;
     }
-#endif

[
         contract(Windows.Foundation.UniversalApiContract, 1.0),
diff --git a/include/windows.storage.streams.idl b/include/windows.storage.streams.idl
index 35340895215..3ef6254c0ec 100644
--- a/include/windows.storage.streams.idl
+++ b/include/windows.storage.streams.idl
@@ -50,18 +50,15 @@ namespace Windows.Storage.Streams {
     runtimeclass Buffer;
     runtimeclass DataWriter;
     runtimeclass DataWriterStoreOperation;
-#ifndef _WINTYPES
     runtimeclass InMemoryRandomAccessStream;
     runtimeclass RandomAccessStream;
     runtimeclass RandomAccessStreamReference;
-#endif

declare {
         interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.Streams.IBuffer *>;
         interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.Streams.IOutputStream *>;
         interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IBuffer *>;
         interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IOutputStream *>;
-#ifndef _WINTYPES
         interface Windows.Foundation.Collections.IIterable<Windows.Storage.Streams.IRandomAccessStream *>;
         interface Windows.Foundation.Collections.IIterator<Windows.Storage.Streams.IRandomAccessStream *>;
         interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Storage.Streams.RandomAccessStreamReference *>;
@@ -81,7 +78,6 @@ namespace Windows.Storage.Streams {
         interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IRandomAccessStreamWithContentType *>;
         interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.RandomAccessStreamReference *>;
         interface Windows.Foundation.IAsyncOperationWithProgress<UINT64,UINT64>;
-#endif
     }

[
@@ -198,7 +194,6 @@ namespace Windows.Storage.Streams {
         HRESULT FlushAsync([out, retval] Windows.Foundation.IAsyncOperation<boolean> **operation);
     }

-#ifndef _WINTYPES
     [
         contract(Windows.Foundation.UniversalApiContract, 1.0),
         exclusiveto(Windows.Storage.Streams.RandomAccessStream),
@@ -270,9 +265,7 @@ namespace Windows.Storage.Streams {
             Windows.Storage.Streams.IContentTypeProvider
     {
     }
-#endif

-#ifndef _WINDOWS_STORAGE
     [
         activatable(Windows.Storage.Streams.IBufferFactory, Windows.Foundation.UniversalApiContract, 1.0),
         contract(Windows.Foundation.UniversalApiContract, 1.0),
@@ -306,9 +299,7 @@ namespace Windows.Storage.Streams {
     {
         [default] interface Windows.Foundation.IAsyncOperation<UINT32>;
     }
-#endif

-#ifndef _WINTYPES
     [
         activatable(Windows.Foundation.UniversalApiContract, 1.0),
         contract(Windows.Foundation.UniversalApiContract, 1.0),
@@ -340,6 +331,5 @@ namespace Windows.Storage.Streams {
     {
         [default] interface Windows.Storage.Streams.IRandomAccessStreamReference;
     }
-#endif

}