net: Consistently use qemu_macaddr_default_if_unset

[qemu.git] / ppc-dis.c

diff --git a/ppc-dis.c b/ppc-dis.c
index e3bc1704b8dff3741ecb9b3673c30c0f7df0bc01..ffdbec18db74743b49a13ff5522d6b54e0409318 100644 (file)
--- a/ppc-dis.c
+++ b/ppc-dis.c
@@ -16,8 +16,8 @@ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
 the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this file; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+along with this file; see the file COPYING.  If not,
+see <http://www.gnu.org/licenses/>.  */
 #include "dis-asm.h"
 #define BFD_DEFAULT_TARGET_SIZE 64
 
@@ -39,8 +39,8 @@ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
 the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this file; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+along with this file; see the file COPYING.  If not,
+see <http://www.gnu.org/licenses/>.  */
 
 /* The opcode table is an array of struct powerpc_opcode.  */
 
@@ -361,9 +361,8 @@ extern const int powerpc_num_macros;
    the GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this file; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with this file; see the file COPYING.
+   If not, see <http://www.gnu.org/licenses/>.  */
 
 /* This file holds the PowerPC opcode table.  The opcode table
    includes almost all of the extended instruction mnemonics.  This
@@ -573,6 +572,7 @@ const struct powerpc_operand powerpc_operands[] =
 
   /* The DS field in a DS form instruction.  This is like D, but the
      lower two bits are forced to zero.  */
+#undef DS
 #define DS DQ + 1
   { 0xfffc, 0, NULL, NULL,
     PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED | PPC_OPERAND_DS },