RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 06-May-2009 21:41:41
Branch: rpm-5_2 Handle: 2009050619414100
Modified files: (Branch: rpm-5_2)
rpm/lib rpmrc.c
rpm/rpmio rpmsyck.c rpmsyck.h
Log:
- jbj: adjust includes to keep WITH_SYCK out of rpmio/*.h files.
Summary:
Revision Changes Path
2.278.2.2 +3 -1 rpm/lib/rpmrc.c
2.1.2.2 +1 -1 rpm/rpmio/rpmsyck.c
2.1.2.1 +12 -6 rpm/rpmio/rpmsyck.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrc.c
============================================================================
$ cvs diff -u -r2.278.2.1 -r2.278.2.2 rpmrc.c
--- rpm/lib/rpmrc.c 6 May 2009 19:26:09 -0000 2.278.2.1
+++ rpm/lib/rpmrc.c 6 May 2009 19:41:41 -0000 2.278.2.2
@@ -28,7 +28,9 @@
#include <rpmcli.h>
-#if defined(WITH_CPUINFO)
+#if defined(WITH_CPUINFO) && defined(WITH_SYCK)
+#include <syck.h>
+#define _RPMSYCK_INTERNAL
#include <rpmsyck.h>
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsyck.c
============================================================================
$ cvs diff -u -r2.1.2.1 -r2.1.2.2 rpmsyck.c
--- rpm/rpmio/rpmsyck.c 6 May 2009 19:26:09 -0000 2.1.2.1
+++ rpm/rpmio/rpmsyck.c 6 May 2009 19:41:41 -0000 2.1.2.2
@@ -4,9 +4,9 @@
#include <syck.h>
#include <rpmhash.h>
+#define _RPMSYCK_INTERNAL
#include <rpmsyck.h>
-
static SYMID
rpmsyck_parse_handler(SyckParser *p, SyckNode *n)
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsyck.h
============================================================================
$ cvs diff -u -r2.1 -r2.1.2.1 rpmsyck.h
--- rpm/rpmio/rpmsyck.h 6 May 2009 01:55:37 -0000 2.1
+++ rpm/rpmio/rpmsyck.h 6 May 2009 19:41:41 -0000 2.1.2.1
@@ -1,11 +1,10 @@
#ifndef H_RPMSYCK
#define H_RPMSYCK
-#if defined(WITH_SYCK)
-
-#include <syck.h>
#include <rpmhash.h>
+/**
+ */
typedef enum {
T_STR,
T_SEQ,
@@ -13,8 +12,13 @@
T_END
} syck_type_t;
+/**
+ */
typedef struct rpmsyck_node_s * rpmsyck_node;
+#if defined(_RPMSYCK_INTERNAL)
+/**
+ */
struct rpmsyck_node_s {
syck_type_t type;
char *tag;
@@ -24,9 +28,11 @@
hashTable map;
} value;
};
-
-rpmsyck_node rpmSyckLoad(char *yaml);
-
#endif
+/**
+ */
+rpmsyck_node rpmSyckLoad(char *yaml)
+ /*...@*/;
+
#endif /* H_RPMSYCK */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
