Ticket #10507: zlib_macro.patch

File zlib_macro.patch, 5.2 KB (added by SiliconFiend@…, 12 years ago)

Patch to accomodate Gentoo's renamed zlib macros

  • mythplugins/mythgame/mythgame/unzip.c

    diff -Naur MythTV-mythtv-6970413/mythplugins/mythgame/mythgame/unzip.c MythTV-mythtv-6970413.new/mythplugins/mythgame/mythgame/unzip.c
    old new  
    493493/*
    494494  Get Info about the current file in the zipfile, with internal only info
    495495*/
    496 local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
     496local int unzlocal_GetCurrentFileInfoInternal _Z_OF((unzFile file,
    497497                                                  unz_file_info *pfile_info,
    498498                                                  unz_file_info_internal
    499499                                                  *pfile_info_internal,
  • mythplugins/mythgame/mythgame/unzip.h

    diff -Naur MythTV-mythtv-6970413/mythplugins/mythgame/mythgame/unzip.h MythTV-mythtv-6970413.new/mythplugins/mythgame/mythgame/unzip.h
    old new  
    111111    tm_unz tmu_date;
    112112} unz_file_info;
    113113
    114 extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
     114extern int ZEXPORT unzStringFileNameCompare _Z_OF ((const char* fileName1,
    115115                                                 const char* fileName2,
    116116                                                 int iCaseSensitivity));
    117117/*
     
    124124*/
    125125
    126126
    127 extern unzFile ZEXPORT unzOpen OF((const char *path));
     127extern unzFile ZEXPORT unzOpen _Z_OF((const char *path));
    128128/*
    129129  Open a Zip file. path contain the full pathname (by example,
    130130     on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
     
    135135           of this unzip package.
    136136*/
    137137
    138 extern int ZEXPORT unzClose OF((unzFile file));
     138extern int ZEXPORT unzClose _Z_OF((unzFile file));
    139139/*
    140140  Close a ZipFile opened with unzipOpen.
    141141  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
    142142    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
    143143  return UNZ_OK if there is no problem. */
    144144
    145 extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
     145extern int ZEXPORT unzGetGlobalInfo _Z_OF((unzFile file,
    146146                                        unz_global_info *pglobal_info));
    147147/*
    148148  Write info about the ZipFile in the *pglobal_info structure.
     
    150150  return UNZ_OK if there is no problem. */
    151151
    152152
    153 extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
     153extern int ZEXPORT unzGetGlobalComment _Z_OF((unzFile file,
    154154                                           char *szComment,
    155155                                           uLong uSizeBuf));
    156156/*
     
    163163/***************************************************************************/
    164164/* Unzip package allow you browse the directory of the zipfile */
    165165
    166 extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
     166extern int ZEXPORT unzGoToFirstFile _Z_OF((unzFile file));
    167167/*
    168168  Set the current file of the zipfile to the first file.
    169169  return UNZ_OK if there is no problem
    170170*/
    171171
    172 extern int ZEXPORT unzGoToNextFile OF((unzFile file));
     172extern int ZEXPORT unzGoToNextFile _Z_OF((unzFile file));
    173173/*
    174174  Set the current file of the zipfile to the next file.
    175175  return UNZ_OK if there is no problem
    176176  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
    177177*/
    178178
    179 extern int ZEXPORT unzLocateFile OF((unzFile file,
     179extern int ZEXPORT unzLocateFile _Z_OF((unzFile file,
    180180                                     const char *szFileName,
    181181                                     int iCaseSensitivity));
    182182/*
     
    189189*/
    190190
    191191
    192 extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
     192extern int ZEXPORT unzGetCurrentFileInfo _Z_OF((unzFile file,
    193193                                             unz_file_info *pfile_info,
    194194                                             char *szFileName,
    195195                                             uLong fileNameBufferSize,
     
    215215   from it, and close it (you can close it before reading all the file)
    216216   */
    217217
    218 extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
     218extern int ZEXPORT unzOpenCurrentFile _Z_OF((unzFile file));
    219219/*
    220220  Open for reading data the current file in the zipfile.
    221221  If there is no error, the return value is UNZ_OK.
    222222*/
    223223
    224 extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
     224extern int ZEXPORT unzCloseCurrentFile _Z_OF((unzFile file));
    225225/*
    226226  Close the file in zip opened with unzOpenCurrentFile
    227227  Return UNZ_CRCERROR if all the file was read but the CRC is not good
    228228*/
    229229
    230 extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
     230extern int ZEXPORT unzReadCurrentFile _Z_OF((unzFile file,
    231231                                          voidp buf,
    232232                                          unsigned len));
    233233/*
     
    241241    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
    242242*/
    243243
    244 extern z_off_t ZEXPORT unztell OF((unzFile file));
     244extern z_off_t ZEXPORT unztell _Z_OF((unzFile file));
    245245/*
    246246  Give the current position in uncompressed data
    247247*/
    248248
    249 extern int ZEXPORT unzeof OF((unzFile file));
     249extern int ZEXPORT unzeof _Z_OF((unzFile file));
    250250/*
    251251  return 1 if the end of file was reached, 0 elsewhere
    252252*/
    253253
    254 extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file, voidp buf,
     254extern int ZEXPORT unzGetLocalExtrafield _Z_OF((unzFile file, voidp buf,
    255255                                             unsigned len));
    256256/*
    257257  Read extra field from the current file (opened by unzOpenCurrentFile)