prepare skia for shared library build on android

include/pdf/SkPDFDevice.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPDFDevice_DEFINED
@@ skipping 12 matching lines @@
 class SkPDFArray;
 class SkPDFDevice;
 class SkPDFDict;
 class SkPDFFont;
 class SkPDFFormXObject;
 class SkPDFGlyphSetMap;
 class SkPDFGraphicState;
 class SkPDFObject;
 class SkPDFShader;
 class SkPDFStream;
+#ifndef SkTSet_DEFINED
 template <typename T> class SK_API SkTSet;
+#endif

[djsollen, 2013/05/30 20:35:29]

remove that from this CL

[Zach Reizner, 2013/05/31 13:16:38]

Turns out this is needed to prevent the following error:
type attributes ignored after type is already defined [-Werror=attributes]

 
 // Private classes.
 struct ContentEntry;
 struct GraphicStateEntry;
 struct NamedDestination;
 
 typedef bool (*EncodeToDCTStream)(SkWStream* stream, const SkBitmap& bitmap, const SkIRect& rect);
 
 /** \class SkPDFDevice
 
@@ skipping 274 matching lines @@
                          const SkMatrix& matrix);
     void handleLinkToNamedDest(SkData* nameData, const SkRect& r,
                                const SkMatrix& matrix);
     void defineNamedDestination(SkData* nameData, const SkPoint& point,
                                 const SkMatrix& matrix);
 
     typedef SkDevice INHERITED;
 };
 
 #endif