Skip to content

Commit

Permalink
Get rid of msstdint.h
Browse files Browse the repository at this point in the history
Not needed with VS 2017 and conflicts with default stdint.h which is
pulled in by python 3
  • Loading branch information
kovidgoyal committed Aug 22, 2020
1 parent 04aedf8 commit 89f0d92
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 244 deletions.
6 changes: 0 additions & 6 deletions COPYRIGHT
Original file line number Diff line number Diff line change
Expand Up @@ -264,12 +264,6 @@ License: LGPL-2.1
The full text of the LGPL is distributed as in
/usr/share/common-licenses/LGPL-2.1 on Debian systems.

Files: src/calibre/utils/lzx/msstdint.h
Copyright: Copyright (C) 2006-2008, Alexander Chemeris
License: BSD
The full text of the BSD license is distributed as in
/usr/share/common-licenses/BSD on Debian systems.

Files: src/calibre/utils/msdes/d3des.h:
Files: src/calibre/utils/msdes/des.c:
Copyright: Copyright (C) 1988,1989,1990,1991,1992, Richard Outerbridge
Expand Down
2 changes: 1 addition & 1 deletion setup/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"name": "lzx",
"sources": "calibre/utils/lzx/lzxmodule.c calibre/utils/lzx/compressor.c calibre/utils/lzx/lzxd.c calibre/utils/lzx/lzc.c calibre/utils/lzx/lzxc.c",
"inc_dirs": "calibre/utils/lzx",
"headers": "calibre/utils/lzx/msstdint.h calibre/utils/lzx/lzc.h calibre/utils/lzx/lzxmodule.h calibre/utils/lzx/system.h calibre/utils/lzx/lzxc.h calibre/utils/lzx/lzxd.h calibre/utils/lzx/mspack.h"
"headers": "calibre/utils/lzx/lzc.h calibre/utils/lzx/lzxmodule.h calibre/utils/lzx/system.h calibre/utils/lzx/lzxc.h calibre/utils/lzx/lzxd.h calibre/utils/lzx/mspack.h"
},
{
"name": "freetype",
Expand Down
7 changes: 1 addition & 6 deletions src/calibre/utils/lzx/lzxc.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@

#include <stdio.h>
#include <stdlib.h>
#ifdef _MSC_VER
# include "msstdint.h"
#else /* _MSC_VER */
# include <stdint.h>
#endif /* _MSC_VER */
#include <stdint.h>
#include <string.h> /* for memset on Linux */
#include <assert.h>
#include <math.h>
Expand Down Expand Up @@ -1281,4 +1277,3 @@ int lzxc_finish(struct lzxc_data *lzxd, struct lzxc_results *lzxr)
free(lzxd);
return 0;
}

7 changes: 1 addition & 6 deletions src/calibre/utils/lzx/lzxc.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@

#pragma once

#ifdef _MSC_VER
#include "msstdint.h"
#endif

typedef struct lzxc_data lzxc_data;
typedef int (*lzxc_get_bytes_t)(void *arg, int n, void *buf);
typedef int (*lzxc_put_bytes_t)(void *arg, int n, void *buf);
Expand All @@ -32,7 +28,7 @@ typedef struct lzxc_results
long len_uncompressed_input;
} lzxc_results;

int lzxc_init(struct lzxc_data **lzxdp, int wsize_code,
int lzxc_init(struct lzxc_data **lzxdp, int wsize_code,
lzxc_get_bytes_t get_bytes, void *get_bytes_arg,
lzxc_at_eof_t at_eof,
lzxc_put_bytes_t put_bytes, void *put_bytes_arg,
Expand All @@ -43,4 +39,3 @@ void lzxc_reset(lzxc_data *lzxd);
int lzxc_compress_block(lzxc_data *lzxd, int block_size, int subdivide);

int lzxc_finish(struct lzxc_data *lzxd, struct lzxc_results *lzxr);

225 changes: 0 additions & 225 deletions src/calibre/utils/lzx/msstdint.h

This file was deleted.

0 comments on commit 89f0d92

Please sign in to comment.