| 1 | --- chm/extra.c.orig 2013-07-10 11:20:33.000000000 -0700 |
| 2 | +++ chm/extra.c 2013-07-10 11:21:36.000000000 -0700 |
| 3 | @@ -70,13 +70,13 @@ |
| 4 | |
| 5 | #define FREE(x) free (x); x = NULL |
| 6 | |
| 7 | -inline uint16_t |
| 8 | +uint16_t |
| 9 | get_uint16 (uint8_t* b) { |
| 10 | return b[0] | |
| 11 | b[1]<<8; |
| 12 | } |
| 13 | |
| 14 | -inline uint32_t |
| 15 | +uint32_t |
| 16 | get_uint32 (uint8_t* b) { |
| 17 | return b[0] | |
| 18 | b[1]<<8 | |
| 19 | @@ -84,7 +84,7 @@ |
| 20 | b[3]<<24; |
| 21 | } |
| 22 | |
| 23 | -inline uint64_t |
| 24 | +uint64_t |
| 25 | get_uint64 (uint8_t* b) { |
| 26 | return b[0] | |
| 27 | b[1]<<8 | |
| 28 | @@ -96,7 +96,7 @@ |
| 29 | (uint64_t) b[7]<<56; |
| 30 | } |
| 31 | |
| 32 | -inline uint64_t |
| 33 | +uint64_t |
| 34 | be_encint (unsigned char *buffer, size_t *length) |
| 35 | { |
| 36 | uint64_t result = 0; |
| 37 | @@ -117,7 +117,7 @@ |
| 38 | Finds the first unset bit in memory. Returns the number of set bits found. |
| 39 | Returns -1 if the buffer runs out before we find an unset bit. |
| 40 | */ |
| 41 | -inline int |
| 42 | +int |
| 43 | ffus (unsigned char* byte, int* bit, size_t *length) { |
| 44 | int bits = 0; |
| 45 | *length = 0; |
| 46 | @@ -144,7 +144,7 @@ |
| 47 | } |
| 48 | |
| 49 | |
| 50 | -inline uint64_t |
| 51 | +uint64_t |
| 52 | sr_int(unsigned char* byte, int* bit, |
| 53 | unsigned char s, unsigned char r, size_t *length) |
| 54 | { |
| 55 | @@ -221,7 +221,7 @@ |
| 56 | } |
| 57 | |
| 58 | |
| 59 | -inline uint32_t |
| 60 | +uint32_t |
| 61 | get_leaf_node_offset(struct chmFile *chmfile, |
| 62 | const char *text, |
| 63 | uint32_t initial_offset, |
| 64 | @@ -294,7 +294,7 @@ |
| 65 | return initial_offset; |
| 66 | } |
| 67 | |
| 68 | -inline int |
| 69 | +int |
| 70 | pychm_process_wlc (struct chmFile *chmfile, |
| 71 | uint64_t wlc_count, uint64_t wlc_size, |
| 72 | uint32_t wlc_offset, unsigned char ds, |