Merge branch 'master' of github.com:xroche/httrack

This commit is contained in:
Xavier Roche
2015-03-31 20:55:45 +02:00
4 changed files with 5 additions and 5 deletions

2
.gitmodules vendored
View File

@@ -1,3 +1,3 @@
[submodule "src/coucal"]
path = src/coucal
url = git@github.com:xroche/coucal.git
url = https://github.com/xroche/coucal.git

View File

@@ -39,6 +39,6 @@ EXTRA_DIST = $(HelpHtml_DATA) $(HelpHtmlimg_DATA) $(HelpHtmlimages_DATA) \
install-data-hook:
if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \
( cd $(DESTDIR)$(prefix)/share/httrack \
&& $(LN_S) ../doc/httrack html \
&& $(LN_S) $(htmldir) html \
) \
fi

View File

@@ -774,7 +774,7 @@ uninstall-am: uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
install-data-hook:
if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \
( cd $(DESTDIR)$(prefix)/share/httrack \
&& $(LN_S) ../doc/httrack html \
&& $(LN_S) $(htmldir) html \
) \
fi

View File

@@ -17,7 +17,7 @@ typedef unsigned long uint32;
#error undefined: SIZEOF_LONG
#endif
typedef struct MD5Context {
struct MD5Context {
union {
unsigned char ui8[64];
uint32 ui32[16];
@@ -25,7 +25,7 @@ typedef struct MD5Context {
uint32 buf[4];
uint32 bits[2];
int doByteReverse;
} MD5CTX;
};
void MD5Init(struct MD5Context *context, int brokenEndian);
void MD5Update(struct MD5Context *context, unsigned char const *buf,