On the 'windows-shared-ra-modules' branch: ra-modules: Make their ra_…

…init.h headers to be 'complete' headers, containing all dependent headers. No functional changes right now. * subversion/libsvn_ra_local/ra_init.h, subversion/libsvn_ra_serf/ra_init.h, subversion/libsvn_ra_svn/ra_init.h (): Add #ifndef and #define to disallow including it twice. (includes): Include ra-loader.h. (): Remove check for ra-loader.h included and erroring if so. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/windows-shared-ra-modules@1920828 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 21, 2024 · 7db93b2 · 7db93b2
1 parent 87dc7bb
commit 7db93b2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/subversion/libsvn_ra_local/ra_init.h b/subversion/libsvn_ra_local/ra_init.h
@@ -21,9 +21,10 @@
  * ====================================================================
  */
 
-#ifndef LIBSVN_RA_RA_LOADER_H
-#error Please include libsvn_ra/ra_loader.h instead of this file
-#else
+#ifndef SVN_LIBSVN_RA_LOCAL_INIT
+#define SVN_LIBSVN_RA_LOCAL_INIT
+
+#include "../libsvn_ra/ra_loader.h"
 
 svn_error_t *svn_ra_local__init(const svn_version_t *loader_version,
                                 const svn_ra__vtable_t **vtable,

diff --git a/subversion/libsvn_ra_serf/ra_init.h b/subversion/libsvn_ra_serf/ra_init.h
@@ -21,9 +21,10 @@
  * ====================================================================
  */
 
-#ifndef LIBSVN_RA_RA_LOADER_H
-#error Please include libsvn_ra/ra_loader.h instead of this file
-#else
+#ifndef SVN_LIBSVN_RA_SERF_INIT
+#define SVN_LIBSVN_RA_SERF_INIT
+
+#include "../libsvn_ra/ra_loader.h"
 
 svn_error_t *svn_ra_serf__init(const svn_version_t *loader_version,
                                const svn_ra__vtable_t **vtable,

diff --git a/subversion/libsvn_ra_svn/ra_init.h b/subversion/libsvn_ra_svn/ra_init.h
@@ -21,9 +21,10 @@
  * ====================================================================
  */
 
-#ifndef LIBSVN_RA_RA_LOADER_H
-#error Please include libsvn_ra/ra_loader.h instead of this file
-#else
+#ifndef SVN_LIBSVN_RA_SVN_INIT
+#define SVN_LIBSVN_RA_SVN_INIT
+
+#include "../libsvn_ra/ra_loader.h"
 
 svn_error_t *svn_ra_svn__init(const svn_version_t *loader_version,
                               const svn_ra__vtable_t **vtable,