(update) Re: Problem with anoncvs? glib and gnome-xml are weird

In message <199810171841.OAA08750@hilfy.ece.cmu.edu>, "Brandon S. Allbery" writ
| I was rather surprised at the number of diffs I got from gnome-xml this
| morning, so I removed my copy and re-checked it out.  But "cvs diff -Rc
| gnome-xml" still returns a large number of diffs... is something wrong with
| the repository?

I'm still confused, but I removed individual conflicting files (having already
blown away and re-checked out those modules!) and re-updated and the problems
have vanished.  Possibly the anon-cvs mirrors aren't in sync with each other.

glib still refuses to diff.  The gnome-libs diff died, but in a way that makes
me think I ran into someone's checkin/update.

# # #

Meanwhile, the results of my diff run show only changes to audiofile to make
it compile on Solaris 2.5.1.  The patches probably aren't the ideal way to
port it, but I'm still a bit weak on proper use of auto{conf,make,header}.
The basic issue is that audiofile uses types that require <sys/types.h>
and/or <sys/bitypes.h> to be included, but doesn't always do so.

Index: audiofile/libaudiofile/au.h
RCS file: /cvs/gnome/audiofile/libaudiofile/au.h,v
retrieving revision
diff -u -r1.1.1.1 au.h
--- au.h	1998/07/11 09:18:12
+++ au.h	1998/10/17 18:46:29
@@ -29,6 +29,9 @@
 #ifndef NEXTSND_H
 #define NEXTSND_H
+#include <sys/types.h>
+#include <sys/bitypes.h>
 struct _AUHeader
 	char		id[4];	/* ".snd" */
Index: audiofile/libaudiofile/audiofile.h
RCS file: /cvs/gnome/audiofile/libaudiofile/audiofile.h,v
retrieving revision
diff -u -r1.1.1.2 audiofile.h
--- audiofile.h	1998/07/16 12:32:57
+++ audiofile.h	1998/10/17 18:46:29
@@ -29,6 +29,7 @@
 #define AUDIOFILE_H
 #include <sys/types.h>
+#include <sys/bitypes.h>
 #include "aupvlist.h"
 typedef struct _AFfilesetup *AFfilesetup;
Index: audiofile/libaudiofile/byteorder.h
RCS file: /cvs/gnome/audiofile/libaudiofile/byteorder.h,v
retrieving revision 1.2
diff -u -r1.2 byteorder.h
--- byteorder.h	1998/08/29 14:24:11	1.2
+++ byteorder.h	1998/10/17 18:46:29
@@ -29,6 +29,9 @@
 #ifndef BYTEORDER_H
 #define BYTEORDER_H
+#include <sys/types.h>
+#include <sys/bitypes.h>
 #if defined (__alpha__) || defined (__i386__)
 	#define __LITTLEENDIAN__
 #elif defined (__mips__) || defined (__ppc__) || defined (__sparc__) \

brandon s. allbery	[os/2][linux][solaris][japh]	 allbery@kf8nh.apk.net
system administrator	     [WAY too many hats]	   allbery@ece.cmu.edu
electrical and computer engineering
carnegie mellon university			   (bsa@kf8nh is still valid.)

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]