token pasting fixes.

This commit is contained in:
espie 2004-01-15 17:57:19 +00:00
parent 98eeb5a06e
commit b03cdbf8fe
2 changed files with 50 additions and 0 deletions

View File

@ -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)

View File

@ -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