Fix wxOSX warnings about int-to-void* casts.

[wxWidgets.git] / include / wx / tarstrm.h

diff --git a/include/wx/tarstrm.h b/include/wx/tarstrm.h
index adb5cb7cbf4967e9f25becc37afc1efb63ca2cfa..906d4383eca3a32a282b9884315e9375178d9017 100644 (file)
--- a/include/wx/tarstrm.h
+++ b/include/wx/tarstrm.h
@@ -1,8 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tarstrm.h
+// Name:        wx/tarstrm.h

 // Purpose:     Streams for Tar files
 // Author:      Mike Wetherell
 // Purpose:     Streams for Tar files
 // Author:      Mike Wetherell

-// RCS-ID:      $Id$

 // Copyright:   (c) 2004 Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2004 Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -22,7 +21,8 @@
 // Constants
 
 // TypeFlag values
 // Constants
 
 // TypeFlag values

-enum {
+enum wxTarType
+{

     wxTAR_REGTYPE   = '0',      // regular file
     wxTAR_LNKTYPE   = '1',      // hard link
     wxTAR_SYMTYPE   = '2',      // symbolic link
     wxTAR_REGTYPE   = '0',      // regular file
     wxTAR_LNKTYPE   = '1',      // hard link
     wxTAR_SYMTYPE   = '2',      // symbolic link


@@ -133,7 +133,7 @@ private:
     wxDateTime   m_ModifyTime;
     wxDateTime   m_AccessTime;
     wxDateTime   m_CreateTime;
     wxDateTime   m_ModifyTime;
     wxDateTime   m_AccessTime;
     wxDateTime   m_CreateTime;

-    wxChar       m_TypeFlag;
+    int          m_TypeFlag;

     wxString     m_LinkName;
     wxString     m_UserName;
     wxString     m_GroupName;
     wxString     m_LinkName;
     wxString     m_UserName;
     wxString     m_GroupName;


@@ -199,7 +199,7 @@ private:
     wxTarHeaderRecords *m_HeaderRecs;
     wxTarHeaderRecords *m_GlobalHeaderRecs;
 
     wxTarHeaderRecords *m_HeaderRecs;
     wxTarHeaderRecords *m_GlobalHeaderRecs;
 

-    DECLARE_NO_COPY_CLASS(wxTarInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxTarInputStream);

 };
 
 
 };
 
 


@@ -280,8 +280,9 @@ private:
     char *m_extendedHdr;
     size_t m_extendedSize;
     wxString m_badfit;
     char *m_extendedHdr;
     size_t m_extendedSize;
     wxString m_badfit;

+    bool m_endrecWritten;

 
 

-    DECLARE_NO_COPY_CLASS(wxTarOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxTarOutputStream);

 };
 
 
 };