*Merge.

--HG-- branch : trunk
2009-02-18 11:36:19 -06:00
parent 017f309b5b 7bff1c1d60
commit 31637d4aac
2384 changed files with 9729 additions and 969 deletions
@@ -799,3 +799,4 @@ int libmpq_file_read_file(mpq_archive *mpq_a, mpq_file *mpq_f, unsigned int file
    /* Return what we've read */
    return bytesread;
 }
+
@@ -70,3 +70,4 @@ char *libmpq_conf_delete_char(char *buf, char *chars);
 int libmpq_conf_get_array(FILE *fp, char *search_value, char ***filelist, int *entries);
 int libmpq_free_listfile(char **filelist);
 int libmpq_read_listfile(mpq_archive *mpq_a, FILE *fp);
+
@@ -426,3 +426,4 @@ unsigned int libmpq_pkzip_explode(
    }
    return LIBMPQ_PKZIP_CMP_ABORT;
 }
+
@@ -84,3 +84,4 @@ extern unsigned int libmpq_pkzip_explode(
 );

 #endif                  /* _EXPLODE_H */
+
@@ -260,3 +260,4 @@ int libmpq_multi_decompress(char *out_buf, int *pout_length, char *in_buf, int i
    }
    return 1;
 }
+
@@ -831,3 +831,4 @@ int libmpq_huff_init_tree(struct huffman_tree *ht, struct huffman_tree_item *hi,

    return 0;
 }
+
@@ -103,3 +103,4 @@ struct huffman_tree {
 int libmpq_huff_init_tree(struct huffman_tree *ht, struct huffman_tree_item *hi, unsigned int cmp);
 int libmpq_huff_do_decompress(struct huffman_tree *ht, struct huffman_input_stream *is, unsigned char *out_buf, unsigned int out_length);
 #endif          /* _HUFFMAN_H */
+
@@ -624,3 +624,4 @@ int libmpq_file_getdata(mpq_archive *mpq_a, mpq_hash mpq_h, const int number, un
    free(mpq_f);
    return success?LIBMPQ_TOOLS_SUCCESS:LIBMPQ_EFILE_CORRUPT;
 }
+
@@ -223,3 +223,4 @@ static decompress_table dcmp_table[] = {
 int libmpq_file_extract(mpq_archive *mpq_a, const int number, const char *filename);
 int libmpq_file_getdata(mpq_archive *mpq_a, mpq_hash mpq_h, const int number, unsigned char *dest);
 #endif                  /* _MPQ_H */
+
@@ -292,3 +292,4 @@ int libmpq_conf_get_array(FILE *fp, char *search_value, char ***filelist, int *e

    return found;
 }
+
@@ -183,3 +183,4 @@ int libmpq_wave_decompress(unsigned char *out_buf, int out_length, unsigned char
    }
    return (out.pb - out_buf);
 }
+
@@ -35,3 +35,4 @@ typedef union {
 int libmpq_wave_decompress(unsigned char *out_buf, int out_length, unsigned char *in_buf, int in_length, int channels);

 #endif                  /* _WAVE_H */
+
@@ -321,3 +321,4 @@ typedef uLong FAR uLongf;
 #endif

 #endif /* ZCONF_H */
+
@@ -1198,3 +1198,4 @@ ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
 #endif

 #endif /* ZLIB_H */
+