git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added -z option.
[swftools.git]
/
src
/
swfcombine.c
diff --git
a/src/swfcombine.c
b/src/swfcombine.c
index
6f082f3
..
229dd1d
100644
(file)
--- a/
src/swfcombine.c
+++ b/
src/swfcombine.c
@@
-12,10
+12,12
@@
#include <string.h>
#include "../lib/rfxswf.h"
#include "../lib/args.h"
#include <string.h>
#include "../lib/rfxswf.h"
#include "../lib/args.h"
+#include "../lib/log.h"
#include "combine.h"
#include "settings.h"
#include "types.h"
#include "flash.h"
#include "combine.h"
#include "settings.h"
#include "types.h"
#include "flash.h"
+#include "reloc.h"
#include "../config.h"
char * master_filename = 0;
#include "../config.h"
char * master_filename = 0;
@@
-361,7
+363,7
@@
void makestackmaster(u8**masterdata, int*masterlength)
pos += 4;
}
}
pos += 4;
}
}
- PUT16(pos, (TAGID_END<<6 + 0));
+ PUT16(pos, ((TAGID_END<<6) + 0));
*masterlength = pos - *masterdata;
PUT32(fixpos, *masterlength);
}
*masterlength = pos - *masterdata;
PUT32(fixpos, *masterlength);
}