From b03cdbf8fe97eda3b0a619d1678775930dc1afc9 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Thu, 15 Jan 2004 17:57:19 +0000
Subject: [PATCH] token pasting fixes.

---
 x11/gtop/patches/patch-main_c     | 12 ++++++++++
 x11/gtop/patches/patch-procview_c | 38 +++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 x11/gtop/patches/patch-main_c
 create mode 100644 x11/gtop/patches/patch-procview_c

diff --git a/x11/gtop/patches/patch-main_c b/x11/gtop/patches/patch-main_c
new file mode 100644
index 00000000000..f74c61f8192
--- /dev/null
+++ b/x11/gtop/patches/patch-main_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-main_c,v 1.1 2004/01/15 17:57:19 espie Exp $
+--- main.c.orig	2001-02-27 15:41:29.000000000 +0100
++++ main.c	2004-01-15 18:47:49.000000000 +0100
+@@ -149,7 +149,7 @@ GnomeUIInfo mainMenu [] = {
+ 	GNOMEUIINFO_END
+ };
+ 
+-#define ADD_PROPERTIES(x,y) gtop_property_object_list = g_list_append (gtop_property_object_list, gnome_property_object_new (& ## x ## Property_Descriptor, &gtop_properties. ## y ##))
++#define ADD_PROPERTIES(x,y) gtop_property_object_list = g_list_append (gtop_property_object_list, gnome_property_object_new (& x ## Property_Descriptor, &gtop_properties. y ))
+ 
+ void
+ gtop_quit (void)
diff --git a/x11/gtop/patches/patch-procview_c b/x11/gtop/patches/patch-procview_c
new file mode 100644
index 00000000000..2a72167f97c
--- /dev/null
+++ b/x11/gtop/patches/patch-procview_c
@@ -0,0 +1,38 @@
+$OpenBSD: patch-procview_c,v 1.1 2004/01/15 17:57:19 espie Exp $
+--- procview.c.orig	2004-01-15 18:48:25.000000000 +0100
++++ procview.c	2004-01-15 18:49:02.000000000 +0100
+@@ -96,29 +96,29 @@ GnomePropertyDescriptor ProcFieldsProper
+ \
+ static int cmp_ ## NAME (const ProcProcData **P, const ProcProcData **Q) \
+ { \
+-	  return (*P)->d->sort_order * ((*P)-> ## NAME - (*Q)-> ## NAME); \
++	  return (*P)->d->sort_order * ((*P)-> NAME - (*Q)-> NAME); \
+ }
+ 
+ #define CMP_INT(NAME) \
+ \
+ static int cmp_ ## NAME (const ProcProcData **P, const ProcProcData **Q) \
+ { \
+-	  return (*P)->d->sort_order * ((*P)->p-> ## NAME - (*Q)->p-> ## NAME); \
++	  return (*P)->d->sort_order * ((*P)->p-> NAME - (*Q)->p-> NAME); \
+ }
+ 
+ #define CMP_INT2(NAME,V1,V2) \
+ \
+ static int cmp_ ## NAME (const ProcProcData **P, const ProcProcData **Q) \
+ { \
+-	  return (*P)->d->sort_order * ((*P)->p-> ## V1 + (*P)->p-> ## V2 - (\
+-                               (*Q)->p-> ## V1 + (*Q)->p-> ## V2)); \
++	  return (*P)->d->sort_order * ((*P)->p-> V1 + (*P)->p-> V2 - (\
++                               (*Q)->p-> V1 + (*Q)->p-> V2)); \
+ }
+ 
+ #define CMP_STR(NAME) \
+ \
+ static int cmp_ ## NAME (const ProcProcData **P, const ProcProcData **Q) \
+ { \
+-	  return (*P)->d->sort_order * strcasecmp ((*P)->p-> ## NAME, (*Q)->p-> ## NAME); \
++	  return (*P)->d->sort_order * strcasecmp ((*P)->p-> NAME, (*Q)->p-> NAME); \
+ }
+ 
+ #define SORT_ASC 1