0 files changed
New commits:
diff-tree 70333bfda5e3080fcffc16a7b2f5abd85c8906b0 (from parents)
Merge: f18a5553388e383638ae064642ea3bab0b021728
b78d0a0bd570f5151cdc08c30ace2d64ce4a3b57
Author: Benjamin Otte <otte@gnome.org>
Date: Tue Apr 17 19:51:21 2007 +0200
Merge branch 'as' of ssh://company@git.freedesktop.org/git/swfdec
into as
Conflicts:
libswfdec/swfdec_script.h
diff-tree f18a5553388e383638ae064642ea3bab0b021728 (from parents)
Merge: a3edf76ea058a63d1ef650cf5f57eeb37b893f3a
ce83f3171f4400aa620464982ab266d567213be5
Author: Benjamin Otte <otte@gnome.org>
Date: Tue Apr 17 14:57:06 2007 +0200
Merge branch 'master' of
ssh://company@git.freedesktop.org/git/swfdec into as
Conflicts:
libswfdec/Makefile.am
libswfdec/swfdec_script.h
diff --cc libswfdec/swfdec_script.h
index 27ef714,b58252b..4b443b8
@@@ -50,10 -50,9 +50,10 @@@
/* must be first arg */
JSFunction * fun; /* function script belongs to or NULL */
SwfdecBuffer * buffer; /* buffer holding the script */
- unsigned int refcount; /* reference count */
+ guint refcount; /* reference count */
char * name; /* name identifying this script */
- unsigned int version; /* version of the script */
- unsigned int n_registers; /* number of registers */
- guint version; /* version of the script */
++ guint version; /* version of the script */
++ guint n_registers; /* number of registers */
gpointer debugger; /* debugger owning us or NULL */
/* needed by functions */
SwfdecBuffer * constant_pool; /* constant pool action */
@@@ -78,8 -77,8 +78,8 @@@
SwfdecScript * swfdec_script_new_for_player (SwfdecPlayer * player,
SwfdecBits * bits,
const char * name,
- unsigned int version);
- guint version);
-void swfdec_script_ref (SwfdecScript * script);
++ guint version);
+SwfdecScript * swfdec_script_ref (SwfdecScript * script);
void swfdec_script_unref (SwfdecScript * script);
JSBool swfdec_script_interpret (SwfdecScript * script,
