fixing amalgamation.

include/simdjson/builtin.h

@@ -24,6 +24,8 @@
 #include "simdjson/lsx.h"
 #elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lasx)
 #include "simdjson/lasx.h"
+#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(rvv)
+#include "simdjson/rvv.h"
 #else
 #error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
 #endif

include/simdjson/rvv/begin.h

@@ -1,15 +1,7 @@
-#ifndef SIMDJSON_RVV_BEGIN_H
-#define SIMDJSON_RVV_BEGIN_H
-
-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
-#include "simdjson/base.h"
-#endif
-
-
-#undef  SIMDJSON_IMPLEMENTATION
 #define SIMDJSON_IMPLEMENTATION rvv
 
 // include RVV intrinsics and definitions
+#include "simdjson/rvv/base.h"
 #include "simdjson/rvv/intrinsics.h"
 #include "simdjson/rvv/bitmanipulation.h"
 #include "simdjson/rvv/bitmask.h"
@@ -17,8 +9,4 @@
 #include "simdjson/rvv/simd.h"
 #include "simdjson/rvv/stringparsing_defs.h"
 
-#ifndef SIMDJSON_SKIP_BACKSLASH_SHORT_CIRCUIT
 #define SIMDJSON_SKIP_BACKSLASH_SHORT_CIRCUIT 1
-#endif
-
-#endif // SIMDJSON_RVV_BEGIN_H

include/simdjson/rvv/end.h

@@ -1,7 +1,6 @@
-#ifndef SIMDJSON_RVV_END_H
-#define SIMDJSON_RVV_END_H
+#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#include "simdjson/rvv/base.h"
+#endif // SIMDJSON_CONDITIONAL_INCLUDE
 
-// Symmetrical to arm64/end.h: currently empty, exists only for structural completeness.
-// Any local macros to be cleaned up can be placed here in the future.
-
-#endif // SIMDJSON_RVV_END_H
+#undef SIMDJSON_SKIP_BACKSLASH_SHORT_CIRCUIT
+#undef SIMDJSON_IMPLEMENTATION