Remove PJ_OBJ type since it is now merged into PJ

1 files changed, 111 insertions, 111 deletions

diff --git a/src/proj_experimental.h b/src/proj_experimental.h
index 292a3baf..31600e67 100644
--- a/src/proj_experimental.h
+++ b/src/proj_experimental.h
@@ -89,7 +89,7 @@ typedef struct
     PJ_UNIT_TYPE unit_type;
 } PJ_AXIS_DESCRIPTION;
 
-PJ_OBJ PROJ_DLL *proj_obj_create_cs(PJ_CONTEXT *ctx,
+PJ PROJ_DLL *proj_obj_create_cs(PJ_CONTEXT *ctx,
                                     PJ_COORDINATE_SYSTEM_TYPE type,
                                     int axis_count,
                                     const PJ_AXIS_DESCRIPTION* axis);
@@ -109,7 +109,7 @@ typedef enum
     PJ_CART2D_WESTING_SOUTHING,
 } PJ_CARTESIAN_CS_2D_TYPE;
 
-PJ_OBJ PROJ_DLL *proj_obj_create_cartesian_2D_cs(PJ_CONTEXT *ctx,
+PJ PROJ_DLL *proj_obj_create_cartesian_2D_cs(PJ_CONTEXT *ctx,
                                                  PJ_CARTESIAN_CS_2D_TYPE type, 
                                                  const char* unit_name,
                                                  double unit_conv_factor);
@@ -124,7 +124,7 @@ typedef enum
     PJ_ELLPS2D_LATITUDE_LONGITUDE,
 } PJ_ELLIPSOIDAL_CS_2D_TYPE;
 
-PJ_OBJ PROJ_DLL *proj_obj_create_ellipsoidal_2D_cs(PJ_CONTEXT *ctx,
+PJ PROJ_DLL *proj_obj_create_ellipsoidal_2D_cs(PJ_CONTEXT *ctx,
                                                    PJ_ELLIPSOIDAL_CS_2D_TYPE type, 
                                                    const char* unit_name,
                                                    double unit_conv_factor);
@@ -136,7 +136,7 @@ PJ_OBJ_LIST PROJ_DLL *proj_obj_query_geodetic_crs_from_datum(
                                                 const char *datum_code,
                                                 const char *crs_type);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_geographic_crs(
+PJ PROJ_DLL *proj_obj_create_geographic_crs(
                             PJ_CONTEXT *ctx,
                             const char *crs_name,
                             const char *datum_name,
@@ -146,15 +146,15 @@ PJ_OBJ PROJ_DLL *proj_obj_create_geographic_crs(
                             double prime_meridian_offset,
                             const char *pm_angular_units,
                             double pm_units_conv,
-                            PJ_OBJ* ellipsoidal_cs);
+                            PJ* ellipsoidal_cs);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_geographic_crs_from_datum(
+PJ PROJ_DLL *proj_obj_create_geographic_crs_from_datum(
                             PJ_CONTEXT *ctx,
                             const char *crs_name,
-                            PJ_OBJ* datum,
-                            PJ_OBJ* ellipsoidal_cs);
+                            PJ* datum,
+                            PJ* ellipsoidal_cs);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_geocentric_crs(
+PJ PROJ_DLL *proj_obj_create_geocentric_crs(
                             PJ_CONTEXT *ctx,
                             const char *crs_name,
                             const char *datum_name,
@@ -167,61 +167,61 @@ PJ_OBJ PROJ_DLL *proj_obj_create_geocentric_crs(
                             const char *linear_units,
                             double linear_units_conv);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_geocentric_crs_from_datum(
+PJ PROJ_DLL *proj_obj_create_geocentric_crs_from_datum(
                             PJ_CONTEXT *ctx,
                             const char *crs_name,
-                            const PJ_OBJ* datum,
+                            const PJ* datum,
                             const char *linear_units,
                             double linear_units_conv);
 
-PJ_OBJ PROJ_DLL *proj_obj_alter_name(PJ_CONTEXT *ctx,
-                                     const PJ_OBJ* obj, const char* name);
+PJ PROJ_DLL *proj_obj_alter_name(PJ_CONTEXT *ctx,
+                                     const PJ* obj, const char* name);
 
-PJ_OBJ PROJ_DLL *proj_obj_alter_id(PJ_CONTEXT *ctx,
-                                   const PJ_OBJ* obj,
+PJ PROJ_DLL *proj_obj_alter_id(PJ_CONTEXT *ctx,
+                                   const PJ* obj,
                                    const char* auth_name,
                                    const char* code);
 
-PJ_OBJ PROJ_DLL *proj_obj_crs_alter_geodetic_crs(PJ_CONTEXT *ctx,
-                                                 const PJ_OBJ* obj,
-                                                 const PJ_OBJ* new_geod_crs);
+PJ PROJ_DLL *proj_obj_crs_alter_geodetic_crs(PJ_CONTEXT *ctx,
+                                                 const PJ* obj,
+                                                 const PJ* new_geod_crs);
 
-PJ_OBJ PROJ_DLL *proj_obj_crs_alter_cs_angular_unit(PJ_CONTEXT *ctx,
-                                                    const PJ_OBJ* obj,
+PJ PROJ_DLL *proj_obj_crs_alter_cs_angular_unit(PJ_CONTEXT *ctx,
+                                                    const PJ* obj,
                                                     const char *angular_units,
                                                     double angular_units_conv,
                                                     const char *unit_auth_name,
                                                     const char *unit_code);
 
-PJ_OBJ PROJ_DLL *proj_obj_crs_alter_cs_linear_unit(PJ_CONTEXT *ctx,
-                                                   const PJ_OBJ* obj,
+PJ PROJ_DLL *proj_obj_crs_alter_cs_linear_unit(PJ_CONTEXT *ctx,
+                                                   const PJ* obj,
                                                    const char *linear_units,
                                                    double linear_units_conv,
                                                    const char *unit_auth_name,
                                                    const char *unit_code);
 
-PJ_OBJ PROJ_DLL *proj_obj_crs_alter_parameters_linear_unit(
+PJ PROJ_DLL *proj_obj_crs_alter_parameters_linear_unit(
                                                     PJ_CONTEXT *ctx,
-                                                    const PJ_OBJ* obj,
+                                                    const PJ* obj,
                                                     const char *linear_units,
                                                     double linear_units_conv,
                                                     const char *unit_auth_name,
                                                     const char *unit_code,
                                                     int convert_to_new_unit);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_engineering_crs(PJ_CONTEXT *ctx,
+PJ PROJ_DLL *proj_obj_create_engineering_crs(PJ_CONTEXT *ctx,
                                                  const char *crsName);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_vertical_crs(PJ_CONTEXT *ctx,
+PJ PROJ_DLL *proj_obj_create_vertical_crs(PJ_CONTEXT *ctx,
                                               const char *crs_name,
                                               const char *datum_name,
                                               const char *linear_units,
                                               double linear_units_conv);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_compound_crs(PJ_CONTEXT *ctx,
+PJ PROJ_DLL *proj_obj_create_compound_crs(PJ_CONTEXT *ctx,
                                               const char *crs_name,
-                                              PJ_OBJ* horiz_crs,
-                                              PJ_OBJ* vert_crs);
+                                              PJ* horiz_crs,
+                                              PJ* vert_crs);
 
 /** Description of a parameter value for a Conversion. */
 typedef struct
@@ -242,7 +242,7 @@ typedef struct
     PJ_UNIT_TYPE unit_type;
 } PJ_PARAM_DESCRIPTION;
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion(PJ_CONTEXT *ctx,
+PJ PROJ_DLL *proj_obj_create_conversion(PJ_CONTEXT *ctx,
                                             const char* name,
                                             const char* auth_name,
                                             const char* code,
@@ -252,14 +252,14 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion(PJ_CONTEXT *ctx,
                                             int param_count,
                                             const PJ_PARAM_DESCRIPTION* params);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_transformation(
+PJ PROJ_DLL *proj_obj_create_transformation(
                                             PJ_CONTEXT *ctx,
                                             const char* name,
                                             const char* auth_name,
                                             const char* code,
-                                            PJ_OBJ* source_crs,
-                                            PJ_OBJ* target_crs,
-                                            PJ_OBJ* interpolation_crs,
+                                            PJ* source_crs,
+                                            PJ* target_crs,
+                                            PJ* interpolation_crs,
                                             const char* method_name,
                                             const char* method_auth_name,
                                             const char* method_code,
@@ -267,33 +267,33 @@ PJ_OBJ PROJ_DLL *proj_obj_create_transformation(
                                             const PJ_PARAM_DESCRIPTION* params,
                                             double accuracy);
 
-PJ_OBJ PROJ_DLL *proj_obj_convert_conversion_to_other_method(PJ_CONTEXT *ctx,
-                                             const PJ_OBJ *conversion,
+PJ PROJ_DLL *proj_obj_convert_conversion_to_other_method(PJ_CONTEXT *ctx,
+                                             const PJ *conversion,
                                              int new_method_epsg_code,
                                              const char *new_method_name);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_projected_crs(PJ_CONTEXT *ctx,
+PJ PROJ_DLL *proj_obj_create_projected_crs(PJ_CONTEXT *ctx,
                                                const char* crs_name,
-                                               const PJ_OBJ* geodetic_crs,
-                                               const PJ_OBJ* conversion,
-                                               const PJ_OBJ* coordinate_system);
+                                               const PJ* geodetic_crs,
+                                               const PJ* conversion,
+                                               const PJ* coordinate_system);
 
-PJ_OBJ PROJ_DLL *proj_obj_crs_create_bound_crs(PJ_CONTEXT *ctx,
-                                               const PJ_OBJ *base_crs,
-                                               const PJ_OBJ *hub_crs,
-                                               const PJ_OBJ *transformation);
+PJ PROJ_DLL *proj_obj_crs_create_bound_crs(PJ_CONTEXT *ctx,
+                                               const PJ *base_crs,
+                                               const PJ *hub_crs,
+                                               const PJ *transformation);
 
-PJ_OBJ PROJ_DLL *proj_obj_crs_create_bound_crs_to_WGS84(PJ_CONTEXT *ctx,
-                                                        const PJ_OBJ *crs,
+PJ PROJ_DLL *proj_obj_crs_create_bound_crs_to_WGS84(PJ_CONTEXT *ctx,
+                                                        const PJ *crs,
                                                         const char *const *options);
 
 /* BEGIN: Generated by scripts/create_c_api_projections.py*/
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_utm(
+PJ PROJ_DLL *proj_obj_create_conversion_utm(
     PJ_CONTEXT *ctx,
     int zone,
     int north);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_transverse_mercator(
+PJ PROJ_DLL *proj_obj_create_conversion_transverse_mercator(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -303,7 +303,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_transverse_mercator(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_gauss_schreiber_transverse_mercator(
+PJ PROJ_DLL *proj_obj_create_conversion_gauss_schreiber_transverse_mercator(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -313,7 +313,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_gauss_schreiber_transverse_mercator(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_transverse_mercator_south_oriented(
+PJ PROJ_DLL *proj_obj_create_conversion_transverse_mercator_south_oriented(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -323,7 +323,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_transverse_mercator_south_oriented(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_two_point_equidistant(
+PJ PROJ_DLL *proj_obj_create_conversion_two_point_equidistant(
     PJ_CONTEXT *ctx,
     double latitude_first_point,
     double longitude_first_point,
@@ -334,7 +334,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_two_point_equidistant(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_tunisia_mapping_grid(
+PJ PROJ_DLL *proj_obj_create_conversion_tunisia_mapping_grid(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -343,7 +343,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_tunisia_mapping_grid(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_albers_equal_area(
+PJ PROJ_DLL *proj_obj_create_conversion_albers_equal_area(
     PJ_CONTEXT *ctx,
     double latitude_false_origin,
     double longitude_false_origin,
@@ -354,7 +354,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_albers_equal_area(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_1sp(
+PJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_1sp(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -364,7 +364,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_1sp(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp(
+PJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp(
     PJ_CONTEXT *ctx,
     double latitude_false_origin,
     double longitude_false_origin,
@@ -375,7 +375,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp_michigan(
+PJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp_michigan(
     PJ_CONTEXT *ctx,
     double latitude_false_origin,
     double longitude_false_origin,
@@ -387,7 +387,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp_michigan
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp_belgium(
+PJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp_belgium(
     PJ_CONTEXT *ctx,
     double latitude_false_origin,
     double longitude_false_origin,
@@ -398,7 +398,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_lambert_conic_conformal_2sp_belgium(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_azimuthal_equidistant(
+PJ PROJ_DLL *proj_obj_create_conversion_azimuthal_equidistant(
     PJ_CONTEXT *ctx,
     double latitude_nat_origin,
     double longitude_nat_origin,
@@ -407,7 +407,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_azimuthal_equidistant(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_guam_projection(
+PJ PROJ_DLL *proj_obj_create_conversion_guam_projection(
     PJ_CONTEXT *ctx,
     double latitude_nat_origin,
     double longitude_nat_origin,
@@ -416,7 +416,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_guam_projection(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_bonne(
+PJ PROJ_DLL *proj_obj_create_conversion_bonne(
     PJ_CONTEXT *ctx,
     double latitude_nat_origin,
     double longitude_nat_origin,
@@ -425,7 +425,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_bonne(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_lambert_cylindrical_equal_area_spherical(
+PJ PROJ_DLL *proj_obj_create_conversion_lambert_cylindrical_equal_area_spherical(
     PJ_CONTEXT *ctx,
     double latitude_first_parallel,
     double longitude_nat_origin,
@@ -434,7 +434,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_lambert_cylindrical_equal_area_spher
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_lambert_cylindrical_equal_area(
+PJ PROJ_DLL *proj_obj_create_conversion_lambert_cylindrical_equal_area(
     PJ_CONTEXT *ctx,
     double latitude_first_parallel,
     double longitude_nat_origin,
@@ -443,7 +443,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_lambert_cylindrical_equal_area(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_cassini_soldner(
+PJ PROJ_DLL *proj_obj_create_conversion_cassini_soldner(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -452,7 +452,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_cassini_soldner(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_equidistant_conic(
+PJ PROJ_DLL *proj_obj_create_conversion_equidistant_conic(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -463,7 +463,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_equidistant_conic(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_eckert_i(
+PJ PROJ_DLL *proj_obj_create_conversion_eckert_i(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -471,7 +471,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_eckert_i(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_eckert_ii(
+PJ PROJ_DLL *proj_obj_create_conversion_eckert_ii(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -479,7 +479,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_eckert_ii(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_eckert_iii(
+PJ PROJ_DLL *proj_obj_create_conversion_eckert_iii(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -487,7 +487,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_eckert_iii(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_eckert_iv(
+PJ PROJ_DLL *proj_obj_create_conversion_eckert_iv(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -495,7 +495,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_eckert_iv(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_eckert_v(
+PJ PROJ_DLL *proj_obj_create_conversion_eckert_v(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -503,7 +503,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_eckert_v(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_eckert_vi(
+PJ PROJ_DLL *proj_obj_create_conversion_eckert_vi(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -511,7 +511,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_eckert_vi(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_equidistant_cylindrical(
+PJ PROJ_DLL *proj_obj_create_conversion_equidistant_cylindrical(
     PJ_CONTEXT *ctx,
     double latitude_first_parallel,
     double longitude_nat_origin,
@@ -520,7 +520,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_equidistant_cylindrical(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_equidistant_cylindrical_spherical(
+PJ PROJ_DLL *proj_obj_create_conversion_equidistant_cylindrical_spherical(
     PJ_CONTEXT *ctx,
     double latitude_first_parallel,
     double longitude_nat_origin,
@@ -529,7 +529,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_equidistant_cylindrical_spherical(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_gall(
+PJ PROJ_DLL *proj_obj_create_conversion_gall(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -537,7 +537,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_gall(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_goode_homolosine(
+PJ PROJ_DLL *proj_obj_create_conversion_goode_homolosine(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -545,7 +545,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_goode_homolosine(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_interrupted_goode_homolosine(
+PJ PROJ_DLL *proj_obj_create_conversion_interrupted_goode_homolosine(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -553,7 +553,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_interrupted_goode_homolosine(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_geostationary_satellite_sweep_x(
+PJ PROJ_DLL *proj_obj_create_conversion_geostationary_satellite_sweep_x(
     PJ_CONTEXT *ctx,
     double center_long,
     double height,
@@ -562,7 +562,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_geostationary_satellite_sweep_x(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_geostationary_satellite_sweep_y(
+PJ PROJ_DLL *proj_obj_create_conversion_geostationary_satellite_sweep_y(
     PJ_CONTEXT *ctx,
     double center_long,
     double height,
@@ -571,7 +571,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_geostationary_satellite_sweep_y(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_gnomonic(
+PJ PROJ_DLL *proj_obj_create_conversion_gnomonic(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -580,7 +580,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_gnomonic(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_variant_a(
+PJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_variant_a(
     PJ_CONTEXT *ctx,
     double latitude_projection_centre,
     double longitude_projection_centre,
@@ -592,7 +592,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_variant_a(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_variant_b(
+PJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_variant_b(
     PJ_CONTEXT *ctx,
     double latitude_projection_centre,
     double longitude_projection_centre,
@@ -604,7 +604,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_variant_b(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_two_point_natural_origin(
+PJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_two_point_natural_origin(
     PJ_CONTEXT *ctx,
     double latitude_projection_centre,
     double latitude_point1,
@@ -617,7 +617,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_hotine_oblique_mercator_two_point_na
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_laborde_oblique_mercator(
+PJ PROJ_DLL *proj_obj_create_conversion_laborde_oblique_mercator(
     PJ_CONTEXT *ctx,
     double latitude_projection_centre,
     double longitude_projection_centre,
@@ -628,7 +628,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_laborde_oblique_mercator(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_international_map_world_polyconic(
+PJ PROJ_DLL *proj_obj_create_conversion_international_map_world_polyconic(
     PJ_CONTEXT *ctx,
     double center_long,
     double latitude_first_parallel,
@@ -638,7 +638,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_international_map_world_polyconic(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_krovak_north_oriented(
+PJ PROJ_DLL *proj_obj_create_conversion_krovak_north_oriented(
     PJ_CONTEXT *ctx,
     double latitude_projection_centre,
     double longitude_of_origin,
@@ -650,7 +650,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_krovak_north_oriented(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_krovak(
+PJ PROJ_DLL *proj_obj_create_conversion_krovak(
     PJ_CONTEXT *ctx,
     double latitude_projection_centre,
     double longitude_of_origin,
@@ -662,7 +662,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_krovak(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_lambert_azimuthal_equal_area(
+PJ PROJ_DLL *proj_obj_create_conversion_lambert_azimuthal_equal_area(
     PJ_CONTEXT *ctx,
     double latitude_nat_origin,
     double longitude_nat_origin,
@@ -671,7 +671,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_lambert_azimuthal_equal_area(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_miller_cylindrical(
+PJ PROJ_DLL *proj_obj_create_conversion_miller_cylindrical(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -679,7 +679,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_miller_cylindrical(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_mercator_variant_a(
+PJ PROJ_DLL *proj_obj_create_conversion_mercator_variant_a(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -689,7 +689,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_mercator_variant_a(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_mercator_variant_b(
+PJ PROJ_DLL *proj_obj_create_conversion_mercator_variant_b(
     PJ_CONTEXT *ctx,
     double latitude_first_parallel,
     double center_long,
@@ -698,7 +698,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_mercator_variant_b(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_popular_visualisation_pseudo_mercator(
+PJ PROJ_DLL *proj_obj_create_conversion_popular_visualisation_pseudo_mercator(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -707,7 +707,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_popular_visualisation_pseudo_mercato
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_mollweide(
+PJ PROJ_DLL *proj_obj_create_conversion_mollweide(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -715,7 +715,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_mollweide(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_new_zealand_mapping_grid(
+PJ PROJ_DLL *proj_obj_create_conversion_new_zealand_mapping_grid(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -724,7 +724,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_new_zealand_mapping_grid(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_oblique_stereographic(
+PJ PROJ_DLL *proj_obj_create_conversion_oblique_stereographic(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -734,7 +734,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_oblique_stereographic(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_orthographic(
+PJ PROJ_DLL *proj_obj_create_conversion_orthographic(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -743,7 +743,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_orthographic(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_american_polyconic(
+PJ PROJ_DLL *proj_obj_create_conversion_american_polyconic(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -752,7 +752,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_american_polyconic(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_polar_stereographic_variant_a(
+PJ PROJ_DLL *proj_obj_create_conversion_polar_stereographic_variant_a(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -762,7 +762,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_polar_stereographic_variant_a(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_polar_stereographic_variant_b(
+PJ PROJ_DLL *proj_obj_create_conversion_polar_stereographic_variant_b(
     PJ_CONTEXT *ctx,
     double latitude_standard_parallel,
     double longitude_of_origin,
@@ -771,7 +771,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_polar_stereographic_variant_b(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_robinson(
+PJ PROJ_DLL *proj_obj_create_conversion_robinson(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -779,7 +779,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_robinson(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_sinusoidal(
+PJ PROJ_DLL *proj_obj_create_conversion_sinusoidal(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -787,7 +787,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_sinusoidal(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_stereographic(
+PJ PROJ_DLL *proj_obj_create_conversion_stereographic(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -797,7 +797,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_stereographic(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_van_der_grinten(
+PJ PROJ_DLL *proj_obj_create_conversion_van_der_grinten(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -805,7 +805,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_van_der_grinten(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_wagner_i(
+PJ PROJ_DLL *proj_obj_create_conversion_wagner_i(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -813,7 +813,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_wagner_i(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_wagner_ii(
+PJ PROJ_DLL *proj_obj_create_conversion_wagner_ii(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -821,7 +821,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_wagner_ii(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_wagner_iii(
+PJ PROJ_DLL *proj_obj_create_conversion_wagner_iii(
     PJ_CONTEXT *ctx,
     double latitude_true_scale,
     double center_long,
@@ -830,7 +830,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_wagner_iii(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_wagner_iv(
+PJ PROJ_DLL *proj_obj_create_conversion_wagner_iv(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -838,7 +838,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_wagner_iv(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_wagner_v(
+PJ PROJ_DLL *proj_obj_create_conversion_wagner_v(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -846,7 +846,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_wagner_v(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_wagner_vi(
+PJ PROJ_DLL *proj_obj_create_conversion_wagner_vi(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -854,7 +854,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_wagner_vi(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_wagner_vii(
+PJ PROJ_DLL *proj_obj_create_conversion_wagner_vii(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,
@@ -862,7 +862,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_wagner_vii(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_quadrilateralized_spherical_cube(
+PJ PROJ_DLL *proj_obj_create_conversion_quadrilateralized_spherical_cube(
     PJ_CONTEXT *ctx,
     double center_lat,
     double center_long,
@@ -871,7 +871,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_quadrilateralized_spherical_cube(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_spherical_cross_track_height(
+PJ PROJ_DLL *proj_obj_create_conversion_spherical_cross_track_height(
     PJ_CONTEXT *ctx,
     double peg_point_lat,
     double peg_point_long,
@@ -880,7 +880,7 @@ PJ_OBJ PROJ_DLL *proj_obj_create_conversion_spherical_cross_track_height(
     const char* ang_unit_name, double ang_unit_conv_factor,
     const char* linear_unit_name, double linear_unit_conv_factor);
 
-PJ_OBJ PROJ_DLL *proj_obj_create_conversion_equal_earth(
+PJ PROJ_DLL *proj_obj_create_conversion_equal_earth(
     PJ_CONTEXT *ctx,
     double center_long,
     double false_easting,