/**
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *  http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied.  See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */
#ifndef __SYS_CONFIG_FCB_H_
#define __SYS_CONFIG_FCB_H_

#ifdef FCB_PRESENT

#include <fcb/fcb.h>
#include "config/config.h"

struct conf_fcb {
    struct conf_store cf_store;
    struct fcb cf_fcb;
};

int conf_fcb_src(struct conf_fcb *fcb);
int conf_fcb_dst(struct conf_fcb *fcb);

#endif

#endif /* __SYS_CONFIG_FCB_H_ */

/**
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *  http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied.  See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */
#ifndef __SYS_CONFIG_FCB_H_
#define __SYS_CONFIG_FCB_H_

#ifdef FCB_PRESENT

#include <fcb/fcb.h>
#include "config/config.h"

struct conf_file {
    struct cf_storage cf_itf;
    struct fcb cf_fcb;
};

int conf_fcb_src(struct conf_fcb *fcb);
int conf_fcb_dst(struct conf_fcb *fcb);

#endif

#endif /* __SYS_CONFIG_FCB_H_ */

--- 
+++ 
@@ -24,8 +24,8 @@
 #include <fcb/fcb.h>
 #include "config/config.h"
 
-struct conf_file {
-    struct cf_storage cf_itf;
+struct conf_fcb {
+    struct conf_store cf_store;
     struct fcb cf_fcb;
 };
 
Update to catch up with renames of internal structures.
