diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-07 10:48:59 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-07 10:51:26 +0100 |
| commit | 59c8609d9e77e9edce1c6ea7ef914deeed248bdd (patch) | |
| tree | d980d90c689d8deec91cb40c0458796560e6ba02 /libmsi/msipriv.h | |
| parent | 7cbed9718d6af0ce10cd3809f1e95859a4c56ec2 (diff) | |
| parent | 3bae43f78b9baf75395981f3225b741c150bec64 (diff) | |
| download | msitools-59c8609d9e77e9edce1c6ea7ef914deeed248bdd.tar.gz msitools-59c8609d9e77e9edce1c6ea7ef914deeed248bdd.tar.xz msitools-59c8609d9e77e9edce1c6ea7ef914deeed248bdd.zip | |
Merge branch 'pre-gsf'
Conflicts:
libmsi/msipriv.h
libmsi/record.c
Diffstat (limited to 'libmsi/msipriv.h')
| -rw-r--r-- | libmsi/msipriv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h index 89554e0..555075f 100644 --- a/libmsi/msipriv.h +++ b/libmsi/msipriv.h @@ -386,7 +386,6 @@ extern unsigned _libmsi_record_get_string( const LibmsiRecord *, unsigned, char extern intptr_t _libmsi_record_get_int_ptr( const LibmsiRecord *, unsigned ); extern unsigned _libmsi_record_save_stream( const LibmsiRecord *, unsigned, char *, unsigned *); extern unsigned _libmsi_record_load_stream(LibmsiRecord *, unsigned, GsfInput *); -extern unsigned _libmsi_record_save_stream_to_file( const LibmsiRecord *, unsigned, const char *); extern unsigned _libmsi_record_load_stream_from_file( LibmsiRecord *, unsigned, const char *); extern unsigned _libmsi_record_copy_field( LibmsiRecord *, unsigned, LibmsiRecord *, unsigned ); extern LibmsiRecord *_libmsi_record_clone( LibmsiRecord * ); |