Eliminate make_cleanup_ui_file_delete / make ui_file a class hierarchy

[binutils-gdb.git] / bfd / aoutf1.h

diff --git a/bfd/aoutf1.h b/bfd/aoutf1.h
index 97e122b8e8ccb014fec20b6bd272369ca1d8fc3c..e693b03a417bf59ee1ca5f9a6209b4e9423b934b 100644 (file)
--- a/bfd/aoutf1.h
+++ b/bfd/aoutf1.h
@@ -1,5 +1,5 @@
 /* A.out "format 1" file handling code for BFD.
-   Copyright (C) 1990-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-2017 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -75,8 +75,9 @@
 #define MY_bfd_merge_private_bfd_data sunos_merge_private_bfd_data
 
 static bfd_boolean
-sunos_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+sunos_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
 {
+  bfd *obfd = info->output_bfd;
   if (bfd_get_flavour (ibfd) != bfd_target_aout_flavour
       || bfd_get_flavour (obfd) != bfd_target_aout_flavour)
     return TRUE;