diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
| commit | 268ef2d8e904db5068dbdc0fdc7ce3940d6452ea (patch) | |
| tree | b1afa687c97fbf5e1ba2c92c5a10479ae5f832f5 /src/Common/Inflate.h | |
| parent | 6d61f06a5348aebe7dbc0bf44d3e2729c20f7fd0 (diff) | |
| parent | 5f47d8b6f11cdb3c4c2f43e04e5acfc6ffcb3035 (diff) | |
| download | VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.tar.gz VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.zip | |
Merge pull request #61 from davidfoerster/normalize-line-terminators
Normalize line terminators
Diffstat (limited to 'src/Common/Inflate.h')
| -rw-r--r-- | src/Common/Inflate.h | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/src/Common/Inflate.h b/src/Common/Inflate.h index a0d4aa5b..8420f3dc 100644 --- a/src/Common/Inflate.h +++ b/src/Common/Inflate.h @@ -1,51 +1,51 @@ -#include <stdio.h>
-#include <windows.h>
-
-#define WSIZE 0x8000 // Window size
-#define ZCONST const
-#define OF(p) p
-
-typedef unsigned long ulg;
-typedef unsigned char uch;
-typedef unsigned short ush;
-typedef void zvoid;
-
-typedef struct huft
-{
- uch b, e;
- union
- {
- ush n;
- struct huft *t;
- }v;
-};
-
-typedef struct
-{
- uch *inptr, *outbufptr;
- int incnt;
- int outCounter;
-
- struct huft *fixed_tl;
- struct huft *fixed_td;
- int fixed_bl, fixed_bd;
-
- unsigned bk, wp;
- ulg bb;
-} G_struct;
-
-#define __GPRO void
-#define __GPRO__
-#define __G
-#define __G__
-#define __GDEF
-
-
-#define FLUSH(cnt) { memcpy (G.outbufptr, redirSlide, cnt); G.outbufptr += cnt; G.outCounter += cnt; }
-#define NEXTBYTE (((G.incnt--) >= 0) ? (*G.inptr++) : EOF)
-
-
-int huft_free(struct huft *t);
-int huft_build(__GDEF ZCONST unsigned *b, unsigned n, unsigned s, ZCONST ush *d, ZCONST ush *e, struct huft **t, int *m);
-
-int DecompressDeflatedData (char *out, char *in, int inLength);
+#include <stdio.h> +#include <windows.h> + +#define WSIZE 0x8000 // Window size +#define ZCONST const +#define OF(p) p + +typedef unsigned long ulg; +typedef unsigned char uch; +typedef unsigned short ush; +typedef void zvoid; + +typedef struct huft +{ + uch b, e; + union + { + ush n; + struct huft *t; + }v; +}; + +typedef struct +{ + uch *inptr, *outbufptr; + int incnt; + int outCounter; + + struct huft *fixed_tl; + struct huft *fixed_td; + int fixed_bl, fixed_bd; + + unsigned bk, wp; + ulg bb; +} G_struct; + +#define __GPRO void +#define __GPRO__ +#define __G +#define __G__ +#define __GDEF + + +#define FLUSH(cnt) { memcpy (G.outbufptr, redirSlide, cnt); G.outbufptr += cnt; G.outCounter += cnt; } +#define NEXTBYTE (((G.incnt--) >= 0) ? (*G.inptr++) : EOF) + + +int huft_free(struct huft *t); +int huft_build(__GDEF ZCONST unsigned *b, unsigned n, unsigned s, ZCONST ush *d, ZCONST ush *e, struct huft **t, int *m); + +int DecompressDeflatedData (char *out, char *in, int inLength); |