gnet r490 - in trunk: . tests/check tests/check/gnet

[tpm svn gnome org]

Author: tpm
Date: Mon Jan  7 10:23:18 2008
New Revision: 490
URL: http://svn.gnome.org/viewvc/gnet?rev=490&view=rev

Log:
	* tests/check/Makefile.am:
	* tests/check/gnet/gnetabi.c:
	* tests/check/gnet/struct_ppc64.h:
	* tests/check/gnet/struct_ppc32.h:
	  Include header based on userland ABI, not on kernel/CPU.



Added:
   trunk/tests/check/gnet/struct_ppc32.h
      - copied unchanged from r489, /trunk/tests/check/gnet/struct_ppc64.h
Removed:
   trunk/tests/check/gnet/struct_ppc64.h
Modified:
   trunk/ChangeLog
   trunk/tests/check/Makefile.am
   trunk/tests/check/gnet/gnetabi.c

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Mon Jan  7 10:23:18 2008
@@ -1,3 +1,11 @@
+2008-01-07  Tim-Philipp MÃller  <tim at centricular dot net>
+
+	* tests/check/Makefile.am:
+	* tests/check/gnet/gnetabi.c:
+	* tests/check/gnet/struct_ppc64.h:
+	* tests/check/gnet/struct_ppc32.h:
+	  Include header based on userland ABI, not on kernel/CPU.
+
 2008-01-06  Tim-Philipp MÃller  <tim at centricular dot net>
 
 	* doc/tmpl/conn.sgml:

Modified: trunk/tests/check/Makefile.am
==============================================================================
--- trunk/tests/check/Makefile.am	(original)
+++ trunk/tests/check/Makefile.am	Mon Jan  7 10:23:18 2008
@@ -193,7 +193,7 @@
 
 noinst_HEADERS =              \
 	gnet/struct_i386.h    \
-	gnet/struct_ppc64.h   \
+	gnet/struct_ppc32.h   \
 	gnet/struct_x86_64.h
 
 AM_CFLAGS = \

Modified: trunk/tests/check/gnet/gnetabi.c
==============================================================================
--- trunk/tests/check/gnet/gnetabi.c	(original)
+++ trunk/tests/check/gnet/gnetabi.c	Mon Jan  7 10:23:18 2008
@@ -33,8 +33,8 @@
 #include "struct_x86_64.h"
 #define HAVE_ABI_SIZES TRUE
 #else
-#ifdef HAVE_CPU_PPC64
-#include "struct_ppc64.h"
+#ifdef __powerpc__
+#include "struct_ppc32.h"
 #define HAVE_ABI_SIZES TRUE
 /*
 #else
@@ -42,8 +42,8 @@
 #include "struct_i386.h"
 #define HAVE_ABI_SIZES TRUE
 #else
-#ifdef HAVE_CPU_PPC
-#include "struct_ppc32.h"
+#ifdef __powerpc64__
+#include "struct_ppc64.h"
 #define HAVE_ABI_SIZES TRUE
 #else
 #ifdef HAVE_CPU_HPPA