changeset 11992:6c6e0d81148b release-3-2-x

fix include guards
author Kai NODA <nodakai@gmail.com>
date Tue, 16 Jun 2009 06:43:56 +0200
parents 1e640b3de2ad
children 9caef5712f40
files doc/interpreter/contributors.in src/ChangeLog src/ls-mat4.h src/ov-type-conv.h
diffstat 4 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/contributors.in	Fri Jun 12 10:47:29 2009 +0200
+++ b/doc/interpreter/contributors.in	Tue Jun 16 06:43:56 2009 +0200
@@ -143,6 +143,7 @@
 Al Niessner
 Rick Niles
 Takuji Nishimura
+Kai Noda
 Eric Norum
 Krzesimir Nowak
 Michael O'Brien
--- a/src/ChangeLog	Fri Jun 12 10:47:29 2009 +0200
+++ b/src/ChangeLog	Tue Jun 16 06:43:56 2009 +0200
@@ -1,3 +1,8 @@
+2009-06-12  Kai NODA  <nodakai@gmail.com>
+
+	* ls-mat4.h: Fix include guard
+	* ov-type-conv.h: Add missing include guard.
+
 2009-06-12  Jaroslav Hajek  <highegg@gmail.com>
 
 	* ov-cell.cc (octave_cell::sort (Array<octave_idx_type>&)): Simplify.
--- a/src/ls-mat4.h	Fri Jun 12 10:47:29 2009 +0200
+++ b/src/ls-mat4.h	Tue Jun 16 06:43:56 2009 +0200
@@ -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);
--- a/src/ov-type-conv.h	Fri Jun 12 10:47:29 2009 +0200
+++ b/src/ov-type-conv.h	Tue Jun 16 06:43:56 2009 +0200
@@ -20,6 +20,9 @@
 
 */
 
+#if !defined (octave_ov_type_conv_h)
+#define octave_ov_type_conv_h 1
+
 static 
 octave_value
 octave_type_conv_body (const octave_value &arg, const std::string& name, int t_result)
@@ -103,6 +106,8 @@
   OCTAVE_TYPE_CONV_BODY3 (NAME, octave_ ## NAME ## _matrix, \
 			  octave_ ## NAME ## _scalar)
 
+#endif
+
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***