am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev

[android/aapt.git] / ZipFile.h

diff --git a/ZipFile.h b/ZipFile.h
index dbbd072d1692decfe2b79e855d5026f95ca2c8a2..78775502884bba157c7be86b88f6c3d9fd7e561f 100644 (file)
--- a/ZipFile.h
+++ b/ZipFile.h
@@ -57,7 +57,7 @@ public:
     /*
      * Open a new or existing archive.
      */
     /*
      * Open a new or existing archive.
      */

-    typedef enum {
+    enum {

         kOpenReadOnly   = 0x01,
         kOpenReadWrite  = 0x02,
         kOpenCreate     = 0x04,     // create if it doesn't exist
         kOpenReadOnly   = 0x01,
         kOpenReadWrite  = 0x02,
         kOpenCreate     = 0x04,     // create if it doesn't exist