include guards of ls-mat4.h and ov-type-conv.h

NODA, Kai nodakai at gmail.com
Thu Jun 11 15:22:36 CDT 2009


Greetings,

Here is a patch which fixes malfunctioning and lack of include guards.
I noticed these while testing my Bash script which feeds
#include <foo.h>
#include <foo.h>
to cpp and does wc -l on the output.
If the number of lines is twice as large as the case of single #include <foo.h>,
there should be a bug around include guard of foo.h.

diff -r 5f36c6c9be13 src/ls-mat4.h
--- a/src/ls-mat4.h     Fri May 15 16:02:30 2009 -0400
+++ b/src/ls-mat4.h     Fri Jun 12 05:19:28 2009 +0900
@@ -21,7 +21,7 @@
 */

 #if !defined (octave_ls_mat4_h)
-#define octave_ls_mat4 1
+#define octave_ls_mat4_h 1

 extern oct_mach_info::float_format
 mopt_digit_to_float_format (int mach);
diff -r 5f36c6c9be13 src/ov-type-conv.h
--- a/src/ov-type-conv.h        Fri May 15 16:02:30 2009 -0400
+++ b/src/ov-type-conv.h        Fri Jun 12 05:19:28 2009 +0900
@@ -19,6 +19,9 @@
 <http://www.gnu.org/licenses/>.

 */
+
+#if !defined (octave_ov_type_conv_h)
+#define octave_ov_type_conv_h 1

 static
 octave_value
@@ -103,6 +106,8 @@
   OCTAVE_TYPE_CONV_BODY3 (NAME, octave_ ## NAME ## _matrix, \
                          octave_ ## NAME ## _scalar)

+#endif // octave_ov_type_conv_h
+
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***

-- 
NODA, Kai <nodakai at gmail.com>


More information about the Bug-octave mailing list