From 0ada4e8dffc5bc76ab3268989355b03f6f435f3a Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Oct 22 2007 21:17:47 +0000 Subject: Fix patch to use glib.h to detect endianness. --- diff --git a/driftnet-0.1.6-no-makedepend.patch b/driftnet-0.1.6-no-makedepend.patch index 5250ca5..ffaf192 100644 --- a/driftnet-0.1.6-no-makedepend.patch +++ b/driftnet-0.1.6-no-makedepend.patch @@ -1,13 +1,12 @@ diff -urN driftnet-0.1.6.old/img.h driftnet-0.1.6/img.h --- driftnet-0.1.6.old/img.h 2002-07-09 20:26:41.000000000 +0100 -+++ driftnet-0.1.6/img.h 2007-10-21 22:28:01.000000000 +0100 -@@ -21,14 +21,13 @@ - #endif ++++ driftnet-0.1.6/img.h 2007-10-22 17:13:58.000000000 -0400 +@@ -22,13 +22,13 @@ #include -- + -#include "endianness.h" -+#include "glib.h" ++#include typedef uint8_t chan; typedef uint32_t pel; @@ -17,7 +16,15 @@ diff -urN driftnet-0.1.6.old/img.h driftnet-0.1.6/img.h +#if (G_BYTE_ORDER == G_LITTLE_ENDIAN) # define PEL(r, g, b) ((pel)((chan)(r) | ((chan)(g) << 8) | ((chan)(b) << 16))) # define PELA(r, g, b, a) ((pel)((chan)(r) | ((chan)(g) << 8) | ((chan)(b) << 16) | ((chan)(a) << 24))) - + +@@ -36,7 +36,7 @@ + # define GETG(p) ((chan)(((p) & (pel)0x0000ff00) >> 8)) + # define GETB(p) ((chan)(((p) & (pel)0x00ff0000) >> 16)) + # define GETA(p) ((chan)(((p) & (pel)0xff000000) >> 24)) +-#elif defined(DRIFTNET_BIG_ENDIAN) ++#elif (G_BYTE_ORDER == G_BIG_ENDIAN) + # define PEL(r, g, b) ((pel)(((chan)(r) << 24) | ((chan)(g) << 16) | ((chan)(b) << 8))) + # define PELA(r, g, b, a) ((pel)(((chan)(r) << 24) | ((chan)(g) << 16) | ((chan)(b) << 8) | ((chan)(a)))) diff -urN driftnet-0.1.6.old/Makefile driftnet-0.1.6/Makefile --- driftnet-0.1.6.old/Makefile 2006-04-03 13:02:13.000000000 +0100 +++ driftnet-0.1.6/Makefile 2007-10-21 22:33:35.000000000 -0400