From 0a51cc868eafe72a98d64e48d8b2ba30a7d8f5dc Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Mon, 16 May 2011 16:07:18 -0600 Subject: Get rid of include guards on sub-headers. --- libdimension/compiler.h | 5 ----- libdimension/dimension/array.h | 5 ----- libdimension/dimension/camera.h | 5 ----- libdimension/dimension/cameras.h | 5 ----- libdimension/dimension/canvas.h | 5 ----- libdimension/dimension/color.h | 5 ----- libdimension/dimension/csg.h | 5 ----- libdimension/dimension/error.h | 5 ----- libdimension/dimension/finish.h | 5 ----- libdimension/dimension/finishes.h | 5 ----- libdimension/dimension/geometry.h | 5 ----- libdimension/dimension/gl.h | 5 ----- libdimension/dimension/inline.h | 5 ----- libdimension/dimension/interior.h | 5 ----- libdimension/dimension/light.h | 5 ----- libdimension/dimension/lights.h | 5 ----- libdimension/dimension/map.h | 6 ------ libdimension/dimension/object.h | 5 ----- libdimension/dimension/objects.h | 5 ----- libdimension/dimension/pattern.h | 5 ----- libdimension/dimension/patterns.h | 5 ----- libdimension/dimension/pigment.h | 5 ----- libdimension/dimension/pigments.h | 5 ----- libdimension/dimension/png.h | 5 ----- libdimension/dimension/polynomial.h | 5 ----- libdimension/dimension/progress.h | 5 ----- libdimension/dimension/raytrace.h | 5 ----- libdimension/dimension/scene.h | 5 ----- libdimension/dimension/sky_sphere.h | 5 ----- libdimension/dimension/texture.h | 5 ----- libdimension/platform.h | 5 ----- libdimension/profile.h | 5 ----- libdimension/progress-impl.h | 5 ----- libdimension/prtree.h | 5 ----- libdimension/threads.h | 5 ----- 35 files changed, 176 deletions(-) diff --git a/libdimension/compiler.h b/libdimension/compiler.h index 7166a19..cb77ca6 100644 --- a/libdimension/compiler.h +++ b/libdimension/compiler.h @@ -23,9 +23,6 @@ * Compiler abstractions. */ -#ifndef DIMENSION_IMPL_COMPILER_H -#define DIMENSION_IMPL_COMPILER_H - #include #ifdef DMNSN_PROFILE @@ -48,5 +45,3 @@ #define DMNSN_HOT #define DMNSN_INTERNAL #endif - -#endif /* DIMENSION_IMPL_COMPILER_H */ diff --git a/libdimension/dimension/array.h b/libdimension/dimension/array.h index 18affd7..dab4d74 100644 --- a/libdimension/dimension/array.h +++ b/libdimension/dimension/array.h @@ -23,9 +23,6 @@ * Simple dynamic arrays. */ -#ifndef DIMENSION_ARRAY_H -#define DIMENSION_ARRAY_H - #include /* For size_t */ #include /* For qsort() */ #include /* For memcpy() */ @@ -322,5 +319,3 @@ dmnsn_array_sort(dmnsn_array *array, dmnsn_array_comparator_fn *comparator) for (type i = dmnsn_array_last(array); \ i - (type)dmnsn_array_first(array) >= 0; \ --i) - -#endif /* DIMENSION_ARRAY_H */ diff --git a/libdimension/dimension/camera.h b/libdimension/dimension/camera.h index f3b3063..c3ad65b 100644 --- a/libdimension/dimension/camera.h +++ b/libdimension/dimension/camera.h @@ -23,9 +23,6 @@ * Cameras. */ -#ifndef DIMENSION_CAMERA_H -#define DIMENSION_CAMERA_H - /* Forward-declare dmnsn_camera */ typedef struct dmnsn_camera dmnsn_camera; @@ -71,5 +68,3 @@ void dmnsn_delete_camera(dmnsn_camera *camera); * @return The ray through (\p x, \p y). */ dmnsn_line dmnsn_camera_ray(const dmnsn_camera *camera, double x, double y); - -#endif /* DIMENSION_CAMERA_H */ diff --git a/libdimension/dimension/cameras.h b/libdimension/dimension/cameras.h index 70e9dc5..d7f44b2 100644 --- a/libdimension/dimension/cameras.h +++ b/libdimension/dimension/cameras.h @@ -23,9 +23,6 @@ * Pre-defined camera types. */ -#ifndef DIMENSION_CAMERAS_H -#define DIMENSION_CAMERAS_H - /** * A perspective camera. The camera is located at the origin, looking at * (0, 0, 1). The feild of view is the section of the plane z = 1 from @@ -34,5 +31,3 @@ * @return A perspective camera. */ dmnsn_camera *dmnsn_new_perspective_camera(void); - -#endif /* DIMENSION_CAMERAS_H */ diff --git a/libdimension/dimension/canvas.h b/libdimension/dimension/canvas.h index b4d0cc4..6938c0e 100644 --- a/libdimension/dimension/canvas.h +++ b/libdimension/dimension/canvas.h @@ -23,9 +23,6 @@ * A canvas which is rendered to. */ -#ifndef DIMENSION_CANVAS_H -#define DIMENSION_CANVAS_H - #include /** A canvas, or image. */ @@ -121,5 +118,3 @@ void dmnsn_set_pixel(dmnsn_canvas *canvas, size_t x, size_t y, * @param[in] color The color to paint it with. */ void dmnsn_clear_canvas(dmnsn_canvas *canvas, dmnsn_color color); - -#endif /* DIMENSION_CANVAS_H */ diff --git a/libdimension/dimension/color.h b/libdimension/dimension/color.h index 8db5158..504ec47 100644 --- a/libdimension/dimension/color.h +++ b/libdimension/dimension/color.h @@ -23,9 +23,6 @@ * Color-related types and operations. */ -#ifndef DIMENSION_COLOR_H -#define DIMENSION_COLOR_H - #include /** A color value. */ @@ -98,5 +95,3 @@ dmnsn_color dmnsn_apply_translucency(dmnsn_color filtered, dmnsn_color filter); dmnsn_color dmnsn_apply_filter(dmnsn_color color, dmnsn_color filter); /** Illuminate \p color with \p light. */ dmnsn_color dmnsn_color_illuminate(dmnsn_color light, dmnsn_color color); - -#endif /* DIMENSION_COLOR_H */ diff --git a/libdimension/dimension/csg.h b/libdimension/dimension/csg.h index f5e43d1..9d86f71 100644 --- a/libdimension/dimension/csg.h +++ b/libdimension/dimension/csg.h @@ -23,9 +23,6 @@ * Constructive solid geometry */ -#ifndef DIMENSION_CSG_H -#define DIMENSION_CSG_H - /** * CSG union. * @param[in] objects The objects from which to compose the union. @@ -56,5 +53,3 @@ dmnsn_object *dmnsn_new_csg_difference(dmnsn_object *A, dmnsn_object *B); * @return The merge of \p A and \p B. */ dmnsn_object *dmnsn_new_csg_merge(dmnsn_object *A, dmnsn_object *B); - -#endif /* DIMENSION_CSG_H */ diff --git a/libdimension/dimension/error.h b/libdimension/dimension/error.h index 23ce706..ae8ba01 100644 --- a/libdimension/dimension/error.h +++ b/libdimension/dimension/error.h @@ -26,9 +26,6 @@ * the set resilience. */ -#ifndef DIMENSION_ERROR_H -#define DIMENSION_ERROR_H - #include /** @@ -99,5 +96,3 @@ dmnsn_fatal_error_fn *dmnsn_get_fatal_error_fn(void); * return. */ void dmnsn_set_fatal_error_fn(dmnsn_fatal_error_fn *fatal); - -#endif /* DIMENSION_ERROR_H */ diff --git a/libdimension/dimension/finish.h b/libdimension/dimension/finish.h index 254a7c0..f2b1df7 100644 --- a/libdimension/dimension/finish.h +++ b/libdimension/dimension/finish.h @@ -23,9 +23,6 @@ * Object finishes. */ -#ifndef DIMENSION_FINISH_H -#define DIMENSION_FINISH_H - /* Forward-declare dmnsn_finish */ typedef struct dmnsn_finish dmnsn_finish; @@ -99,5 +96,3 @@ dmnsn_finish *dmnsn_new_finish(void); * @param[in,out] finish The finish to delete. */ void dmnsn_delete_finish(dmnsn_finish *finish); - -#endif /* DIMENSION_FINISH_H */ diff --git a/libdimension/dimension/finishes.h b/libdimension/dimension/finishes.h index 074521e..e3c308c 100644 --- a/libdimension/dimension/finishes.h +++ b/libdimension/dimension/finishes.h @@ -23,9 +23,6 @@ * Pre-defined finishes. */ -#ifndef DIMENSION_FINISHES_H -#define DIMENSION_FINISHES_H - /** * Add two finishes together. * @param[in,out] f1 The first finish. @@ -65,5 +62,3 @@ dmnsn_finish *dmnsn_new_phong_finish(double specular, double exp); */ dmnsn_finish *dmnsn_new_reflective_finish(dmnsn_color min, dmnsn_color max, double falloff); - -#endif /* DIMENSION_FINISHES_H */ diff --git a/libdimension/dimension/geometry.h b/libdimension/dimension/geometry.h index 724c9cc..74807f7 100644 --- a/libdimension/dimension/geometry.h +++ b/libdimension/dimension/geometry.h @@ -23,9 +23,6 @@ * Core geometric types like vectors, matricies, and rays. */ -#ifndef DIMENSION_GEOMETRY_H -#define DIMENSION_GEOMETRY_H - #include #include @@ -443,5 +440,3 @@ dmnsn_bounding_box_is_infinite(dmnsn_bounding_box box) { return box.min.x == -INFINITY; } - -#endif /* DIMENSION_GEOMETRY_H */ diff --git a/libdimension/dimension/gl.h b/libdimension/dimension/gl.h index 4473f80..e276228 100644 --- a/libdimension/dimension/gl.h +++ b/libdimension/dimension/gl.h @@ -23,9 +23,6 @@ * OpenGL export/import of canvases. */ -#ifndef DIMENSION_GL_H -#define DIMENSION_GL_H - /** * Optimize a canvas for GL drawing * @param[in,out] canvas The canvas to optimize. @@ -50,5 +47,3 @@ int dmnsn_gl_write_canvas(const dmnsn_canvas *canvas); */ dmnsn_canvas *dmnsn_gl_read_canvas(size_t x0, size_t y0, size_t width, size_t height); - -#endif /* DIMENSION_GL_H */ diff --git a/libdimension/dimension/inline.h b/libdimension/dimension/inline.h index 8a83a85..e17c60e 100644 --- a/libdimension/dimension/inline.h +++ b/libdimension/dimension/inline.h @@ -26,9 +26,6 @@ * translation unit when necessary. */ -#ifndef DIMENSION_INLINE_H -#define DIMENSION_INLINE_H - /** * @def DMNSN_INLINE * A portable inline specifier. Expands to the correct method of declaring @@ -50,5 +47,3 @@ #define DMNSN_INLINE static #endif #endif - -#endif /* DIMENSION_INLINE_H */ diff --git a/libdimension/dimension/interior.h b/libdimension/dimension/interior.h index f4bbed0..88af0b9 100644 --- a/libdimension/dimension/interior.h +++ b/libdimension/dimension/interior.h @@ -23,9 +23,6 @@ * Object interiors. */ -#ifndef DIMENSION_INTERIOR_H -#define DIMENSION_INTERIOR_H - /** An interior. */ typedef struct dmnsn_interior { double ior; /**< Refractive index. */ @@ -50,5 +47,3 @@ dmnsn_interior *dmnsn_new_interior(void); * @param[in,out] interior The interior to delete. */ void dmnsn_delete_interior(dmnsn_interior *interior); - -#endif /* DIMENSION_INTERIOR_H */ diff --git a/libdimension/dimension/light.h b/libdimension/dimension/light.h index 3180534..03de641 100644 --- a/libdimension/dimension/light.h +++ b/libdimension/dimension/light.h @@ -23,9 +23,6 @@ * Lights. */ -#ifndef DIMENSION_LIGHT_H -#define DIMENSION_LIGHT_H - /* Forward-declar dmnsn_light */ typedef struct dmnsn_light dmnsn_light; @@ -60,5 +57,3 @@ dmnsn_light *dmnsn_new_light(void); * @param[in,out] light The light to delete. */ void dmnsn_delete_light(dmnsn_light *light); - -#endif /* DIMENSION_LIGHT_H */ diff --git a/libdimension/dimension/lights.h b/libdimension/dimension/lights.h index 28787b2..41ffad9 100644 --- a/libdimension/dimension/lights.h +++ b/libdimension/dimension/lights.h @@ -23,9 +23,6 @@ * Pre-defined light types. */ -#ifndef DIMENSION_LIGHTS_H -#define DIMENSION_LIGHTS_H - /** * A point light. * @param[in] x0 The origin of the light. @@ -33,5 +30,3 @@ * @return A point light. */ dmnsn_light *dmnsn_new_point_light(dmnsn_vector x0, dmnsn_color color); - -#endif /* DIMENSION_LIGHTS_H */ diff --git a/libdimension/dimension/map.h b/libdimension/dimension/map.h index ca30b3a..80b48b6 100644 --- a/libdimension/dimension/map.h +++ b/libdimension/dimension/map.h @@ -18,15 +18,11 @@ * . * *************************************************************************/ - /** * @file * Generic maps (backend for color_maps, pigment_maps, etc.). */ -#ifndef DIMENSION_MAP_H -#define DIMENSION_MAP_H - /** A map. */ typedef struct dmnsn_map { dmnsn_free_fn *free_fn; /**< Destructor callback. */ @@ -79,5 +75,3 @@ void dmnsn_evaluate_map(const dmnsn_map *map, double n, * @param[in] callback The callback to apply to the elements. */ void dmnsn_map_apply(dmnsn_map *map, dmnsn_callback_fn *callback); - -#endif /* DIMENSION_MAP_H */ diff --git a/libdimension/dimension/object.h b/libdimension/dimension/object.h index 46ff8f7..ea8a6a8 100644 --- a/libdimension/dimension/object.h +++ b/libdimension/dimension/object.h @@ -23,9 +23,6 @@ * Objects. */ -#ifndef DIMENSION_OBJECT_H -#define DIMENSION_OBJECT_H - #include /** A type to represent a ray-object intersection. */ @@ -167,5 +164,3 @@ dmnsn_object_inside(const dmnsn_object *object, dmnsn_vector point) point = dmnsn_transform_vector(object->trans_inv, point); return object->inside_fn(object, point); } - -#endif /* DIMENSION_OBJECT_H */ diff --git a/libdimension/dimension/objects.h b/libdimension/dimension/objects.h index b115030..aa53329 100644 --- a/libdimension/dimension/objects.h +++ b/libdimension/dimension/objects.h @@ -23,9 +23,6 @@ * Pre-defined objects. */ -#ifndef DIMENSION_OBJECTS_H -#define DIMENSION_OBJECTS_H - #include /** @@ -63,5 +60,3 @@ dmnsn_object *dmnsn_new_cone(double r1, double r2, bool open); * @return A torus, centered at the origin and lying in the x-z plane. */ dmnsn_object *dmnsn_new_torus(double major, double minor); - -#endif /* DIMENSION_OBJECTS_H */ diff --git a/libdimension/dimension/pattern.h b/libdimension/dimension/pattern.h index f0ffa17..beeb9f7 100644 --- a/libdimension/dimension/pattern.h +++ b/libdimension/dimension/pattern.h @@ -24,9 +24,6 @@ * used for pigments and normals. */ -#ifndef DIMENSION_PATTERN_H -#define DIMENSION_PATTERN_H - /* Forward-declare dmnsn_pattern */ typedef struct dmnsn_pattern dmnsn_pattern; @@ -77,5 +74,3 @@ void dmnsn_initialize_pattern(dmnsn_pattern *pattern); * @return The value of the pattern at \p v. */ double dmnsn_pattern_value(const dmnsn_pattern *pattern, dmnsn_vector v); - -#endif /* DIMENSION_PATTERN_H */ diff --git a/libdimension/dimension/patterns.h b/libdimension/dimension/patterns.h index 8982fc0..5506941 100644 --- a/libdimension/dimension/patterns.h +++ b/libdimension/dimension/patterns.h @@ -23,9 +23,6 @@ * Pre-defined patterns. */ -#ifndef DIMENSION_PATTERNS_H -#define DIMENSION_PATTERNS_H - /** * A checker pattern. The pattern is composed of tesselating unit cubes * alternating between 0 and 1. @@ -40,5 +37,3 @@ dmnsn_pattern *dmnsn_new_checker_pattern(void); * @return A gradient pattern. */ dmnsn_pattern *dmnsn_new_gradient_pattern(dmnsn_vector orientation); - -#endif /* DIMENSION_PATTERNS_H */ diff --git a/libdimension/dimension/pigment.h b/libdimension/dimension/pigment.h index ef8ad8b..896c0bc 100644 --- a/libdimension/dimension/pigment.h +++ b/libdimension/dimension/pigment.h @@ -23,9 +23,6 @@ * Object pigments. */ -#ifndef DIMENSION_PIGMENT_H -#define DIMENSION_PIGMENT_H - /* Forward-declare dmnsn_pigment */ typedef struct dmnsn_pigment dmnsn_pigment; @@ -79,5 +76,3 @@ void dmnsn_delete_pigment(dmnsn_pigment *pigment); * @param[in,out] pigment The pigment to initialize. */ void dmnsn_initialize_pigment(dmnsn_pigment *pigment); - -#endif /* DIMENSION_PIGMENT_H */ diff --git a/libdimension/dimension/pigments.h b/libdimension/dimension/pigments.h index d554fde..26b75f8 100644 --- a/libdimension/dimension/pigments.h +++ b/libdimension/dimension/pigments.h @@ -23,9 +23,6 @@ * Pre-defined pigments. */ -#ifndef DIMENSION_PIGMENTS_H -#define DIMENSION_PIGMENTS_H - /** * A solid color. * @param[in] color The color of the pigment. @@ -70,5 +67,3 @@ dmnsn_map *dmnsn_new_pigment_map(void); */ dmnsn_pigment *dmnsn_new_pigment_map_pigment(dmnsn_pattern *pattern, dmnsn_map *map); - -#endif /* DIMENSION_PIGMENTS_H */ diff --git a/libdimension/dimension/png.h b/libdimension/dimension/png.h index 5ef42a3..12782e9 100644 --- a/libdimension/dimension/png.h +++ b/libdimension/dimension/png.h @@ -23,9 +23,6 @@ * PNG import/export of canvases */ -#ifndef DIMENSION_PNG_H -#define DIMENSION_PNG_H - #include /** @@ -69,5 +66,3 @@ dmnsn_canvas *dmnsn_png_read_canvas(FILE *file); * @return A \ref dmnsn_progress object, or NULL on failure. */ dmnsn_progress *dmnsn_png_read_canvas_async(dmnsn_canvas **canvas, FILE *file); - -#endif /* DIMENSION_PNG_H */ diff --git a/libdimension/dimension/polynomial.h b/libdimension/dimension/polynomial.h index 6c5ff8e..7e53566 100644 --- a/libdimension/dimension/polynomial.h +++ b/libdimension/dimension/polynomial.h @@ -25,9 +25,6 @@ * coefficient on x^i. In general, we are only interested in positive roots. */ -#ifndef DIMENSION_POLYNOMIAL_H -#define DIMENSION_POLYNOMIAL_H - #include #include @@ -86,5 +83,3 @@ size_t dmnsn_solve_polynomial(const double poly[], size_t degree, double x[]); * @param[in] degree The degree of the polynomial. */ void dmnsn_print_polynomial(FILE *file, const double poly[], size_t degree); - -#endif /* DIMENSION_POLYNOMIAL_H */ diff --git a/libdimension/dimension/progress.h b/libdimension/dimension/progress.h index f3b888e..ff5fccd 100644 --- a/libdimension/dimension/progress.h +++ b/libdimension/dimension/progress.h @@ -26,9 +26,6 @@ * is returned as an int from dmnsn_finish_progress(). */ -#ifndef DIMENSION_PROGRESS_H -#define DIMENSION_PROGRESS_H - /** A progress object. */ typedef struct dmnsn_progress dmnsn_progress; @@ -54,5 +51,3 @@ double dmnsn_get_progress(const dmnsn_progress *progress); * @param[in] prog The progress value to wait for. */ void dmnsn_wait_progress(const dmnsn_progress *progress, double prog); - -#endif /* DIMENSION_PROGRESS_H */ diff --git a/libdimension/dimension/raytrace.h b/libdimension/dimension/raytrace.h index 7c3c474..5cd803e 100644 --- a/libdimension/dimension/raytrace.h +++ b/libdimension/dimension/raytrace.h @@ -23,9 +23,6 @@ * Ray-trace a scene. */ -#ifndef DIMENSION_RAYTRACE_H -#define DIMENSION_RAYTRACE_H - /** * Render a scene by raytracing. * @param[in,out] scene The scene to render. @@ -38,5 +35,3 @@ void dmnsn_raytrace_scene(dmnsn_scene *scene); * @return A \p dmnsn_progress object. */ dmnsn_progress *dmnsn_raytrace_scene_async(dmnsn_scene *scene); - -#endif /* DIMENSION_RAYTRACE_H */ diff --git a/libdimension/dimension/scene.h b/libdimension/dimension/scene.h index 7b44231..2d9840b 100644 --- a/libdimension/dimension/scene.h +++ b/libdimension/dimension/scene.h @@ -23,9 +23,6 @@ * Entire scenes. */ -#ifndef DIMENSION_SCENE_H -#define DIMENSION_SCENE_H - /** Render quality flags. */ enum { DMNSN_RENDER_NONE = 0, /**< Render nothing. */ @@ -94,5 +91,3 @@ void dmnsn_delete_scene(dmnsn_scene *scene); * @param[in,out] scene The scene to initalize. */ void dmnsn_initialize_scene(dmnsn_scene *scene); - -#endif /* DIMENSION_SCENE_H */ diff --git a/libdimension/dimension/sky_sphere.h b/libdimension/dimension/sky_sphere.h index 3a17261..43ad57e 100644 --- a/libdimension/dimension/sky_sphere.h +++ b/libdimension/dimension/sky_sphere.h @@ -23,9 +23,6 @@ * Sky spheres. */ -#ifndef DIMENSION_SKY_SPHERE_H -#define DIMENSION_SKY_SPHERE_H - /** A sky sphere. */ typedef struct dmnsn_sky_sphere { /** An array of pigments in inside-to-outside order. */ @@ -59,5 +56,3 @@ void dmnsn_initialize_sky_sphere(dmnsn_sky_sphere *sky_sphere); */ dmnsn_color dmnsn_sky_sphere_color(const dmnsn_sky_sphere *sky_sphere, dmnsn_vector d); - -#endif /* DIMENSION_SKY_SPHERE_H */ diff --git a/libdimension/dimension/texture.h b/libdimension/dimension/texture.h index 2ecf461..31ab86b 100644 --- a/libdimension/dimension/texture.h +++ b/libdimension/dimension/texture.h @@ -23,9 +23,6 @@ * Object textures. */ -#ifndef DIMENSION_TEXTURE_H -#define DIMENSION_TEXTURE_H - /** A complete texture. */ typedef struct { dmnsn_pigment *pigment; /**< Pigment. */ @@ -57,5 +54,3 @@ void dmnsn_delete_texture(dmnsn_texture *texture); * @param[in,out] texture The texture to initialize. */ void dmnsn_initialize_texture(dmnsn_texture *texture); - -#endif /* DIMENSION_TEXTURE_H */ diff --git a/libdimension/platform.h b/libdimension/platform.h index 95f8fed..dc389f0 100644 --- a/libdimension/platform.h +++ b/libdimension/platform.h @@ -23,9 +23,6 @@ * Platform abstractions. */ -#ifndef DIMENSION_IMPL_PLATFORM_H -#define DIMENSION_IMPL_PLATFORM_H - #include #include #include @@ -61,5 +58,3 @@ DMNSN_INTERNAL size_t dmnsn_ncpus(void); * times. */ DMNSN_INTERNAL void dmnsn_get_times(dmnsn_timer *timer); - -#endif /* DIMENSION_IMPL_PLATFORM_H */ diff --git a/libdimension/profile.h b/libdimension/profile.h index f7359a3..4817482 100644 --- a/libdimension/profile.h +++ b/libdimension/profile.h @@ -23,9 +23,6 @@ * Built-in branch profiler. */ -#ifndef DIMENSION_IMPL_PROFILE_H -#define DIMENSION_IMPL_PROFILE_H - #include /** @@ -40,5 +37,3 @@ */ DMNSN_INTERNAL bool dmnsn_expect(bool result, bool expected, const char *func, const char *file, unsigned int line); - -#endif /* DIMENSION_IMPL_PROFILE_H */ diff --git a/libdimension/progress-impl.h b/libdimension/progress-impl.h index 1ca9b25..973c161 100644 --- a/libdimension/progress-impl.h +++ b/libdimension/progress-impl.h @@ -23,9 +23,6 @@ * Progress object implementation. */ -#ifndef DIMENSION_IMPL_PROGRESS_H -#define DIMENSION_IMPL_PROGRESS_H - #include /** Allocate a new progress object. */ @@ -57,5 +54,3 @@ struct dmnsn_progress { volatile double min_wait; volatile double *min_waitp; /* Hack for const values */ }; - -#endif /* DIMENSION_IMPL_PROGRESS_H */ diff --git a/libdimension/prtree.h b/libdimension/prtree.h index 26d6c1e..e799675 100644 --- a/libdimension/prtree.h +++ b/libdimension/prtree.h @@ -26,9 +26,6 @@ * from B-trees. */ -#ifndef DIMENSION_IMPL_PRTREE_H -#define DIMENSION_IMPL_PRTREE_H - #include /** A priority R-tree; the spatial subdivision method used for intersection @@ -50,5 +47,3 @@ bool dmnsn_prtree_intersection(const dmnsn_prtree *tree, dmnsn_line ray, dmnsn_intersection *intersection, bool reset); /** Determine whether a point is inside any object in the tree. */ bool dmnsn_prtree_inside(const dmnsn_prtree *tree, dmnsn_vector point); - -#endif /* DIMENSION_IMPL_PRTREE_H */ diff --git a/libdimension/threads.h b/libdimension/threads.h index af6d641..8e88e7c 100644 --- a/libdimension/threads.h +++ b/libdimension/threads.h @@ -23,9 +23,6 @@ * Background threading interface. */ -#ifndef DIMENSION_IMPL_THREADS_H -#define DIMENSION_IMPL_THREADS_H - /** * Thread callback type. * @param[in,out] ptr An arbitrary pointer. @@ -61,5 +58,3 @@ DMNSN_INTERNAL void dmnsn_new_thread(dmnsn_progress *progress, */ DMNSN_INTERNAL int dmnsn_execute_concurrently(dmnsn_ccthread_fn *ccthread_fn, void *arg, unsigned int nthreads); - -#endif /* DIMENSION_IMPL_THREADS_H */ -- cgit v1.2.3