Code drop from //branches/cupcake/...@124589

1 files changed, 3 insertions, 29 deletions

diff --git a/WebKit/win/Interfaces/IWebTextRenderer.idl b/WebKit/win/Interfaces/IWebTextRenderer.idl
index 5c88d98..bdfc54a 100644
--- a/WebKit/win/Interfaces/IWebTextRenderer.idl
+++ b/WebKit/win/Interfaces/IWebTextRenderer.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,36 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc. All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" *")
-cpp_quote(" * 1.  Redistributions of source code must retain the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2.  Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *     documentation and/or other materials provided with the distribution.")
-cpp_quote(" * 3.  Neither the name of Apple Computer, Inc. (\"Apple\") nor the names of")
-cpp_quote(" *     its contributors may be used to endorse or promote products derived")
-cpp_quote(" *     from this software without specific prior written permission.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS \"AS IS\" AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED")
-cpp_quote(" * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE")
-cpp_quote(" * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY")
-cpp_quote(" * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES")
-cpp_quote(" * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;")
-cpp_quote(" * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND")
-cpp_quote(" * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF")
-cpp_quote(" * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,