Commit ca3d87d4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-include-2016-07-12' into staging 



Clean up #include "..." vs <...> and header guards

# gpg: Signature made Tue 12 Jul 2016 15:23:43 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-include-2016-07-12:
  cris: Fix broken header guard in hw/cris/boot.h
  Clean up decorations and whitespace around header guards
  Clean up ill-advised or unusual header guards
  libdecnumber: Don't error out on decNumberLocal.h re-inclusion
  libdecnumber: Don't fool around with guards to avoid #include
  Clean up header guards that don't match their file name
  Drop Emacs local variables lists redundant with .dir-locals.el
  spapr_pci: Include spapr.h instead of playing games with #error
  tcg: Clean up tcg-target.h header guards
  linux-user: Fix broken header guard in syscall_defs.h
  linux-user: Clean up hostdep.h header guards
  linux-user: Clean up target_structs.h header guards
  linux-user: Clean up target_signal.h header guards
  linux-user: Clean up target_cpu.h header guards
  linux-user: Clean up target_syscall.h header guards
  target-*: Clean up cpu.h header guards
  scripts: New clean-header-guards.pl
  Use #include "..." for our own headers, <...> for others

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7d820b76 82751a32

audio/audio.h

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



#ifndef QEMU_AUDIO_H

#define QEMU_AUDIO_H
@@ -162,4 +163,4 @@ static inline void *advance (void *p, int incr) 
int wav_start_capture (CaptureState *s, const char *path, int freq,

                       int bits, int nchannels);



#endif  /* audio.h */
 
#endif /* QEMU_AUDIO_H */

audio/audio_int.h

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



#ifndef QEMU_AUDIO_INT_H

#define QEMU_AUDIO_INT_H
@@ -257,4 +258,4 @@ static inline int audio_ring_dist (int dst, int src, int len) 
#define AUDIO_FUNC __FILE__ ":" AUDIO_STRINGIFY (__LINE__)

#endif



#endif /* audio_int.h */
 
#endif /* QEMU_AUDIO_INT_H */

audio/audio_pt_int.h

+1 −1
Original line number Diff line number Diff line
@@ -19,4 +19,4 @@ int audio_pt_wait (struct audio_pt *, const char *); 
int audio_pt_unlock_and_signal (struct audio_pt *, const char *);

int audio_pt_join (struct audio_pt *, void **, const char *);



#endif /* audio_pt_int.h */
 
#endif /* QEMU_AUDIO_PT_INT_H */

audio/mixeng.h

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



#ifndef QEMU_MIXENG_H

#define QEMU_MIXENG_H
@@ -48,4 +49,4 @@ void st_rate_stop (void *opaque); 
void mixeng_clear (struct st_sample *buf, int len);

void mixeng_volume (struct st_sample *buf, int len, struct mixeng_volume *vol);



#endif  /* mixeng.h */
 
#endif /* QEMU_MIXENG_H */

block/iscsi.c

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 


#ifdef __linux__

#include <scsi/sg.h>

#include <block/scsi.h>

#endif



typedef struct IscsiLun {