*** empty log message ***

[bpt/guile.git] / libguile / strorder.h

diff --git a/libguile/strorder.h b/libguile/strorder.h
index ebc4a8d..71b94e9 100644 (file)
--- a/libguile/strorder.h
+++ b/libguile/strorder.h
@@ -16,7 +16,8 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
  *
  * As a special exception, the Free Software Foundation gives permission
  * for additional uses of the text contained in its release of GUILE.
@@ -40,11 +41,10 @@
  *
  * If you write modifications of your own for GUILE, it is your choice
  * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  
- */
+ * If you do not wish that, delete this exception notice.  */
 \f
 
-#include "__scm.h"
+#include "libguile/__scm.h"
 
 \f
 
@@ -52,34 +52,17 @@
 
 
 \f
-#ifdef __STDC__
-extern SCM scm_string_equal_p (SCM s1, SCM s2);
-extern SCM scm_string_ci_equal_p (SCM s1, SCM s2);
-extern SCM scm_string_less_p (SCM s1, SCM s2);
-extern SCM scm_string_leq_p (SCM s1, SCM s2);
-extern SCM scm_string_gr_p (SCM s1, SCM s2);
-extern SCM scm_string_geq_p (SCM s1, SCM s2);
-extern SCM scm_string_ci_less_p (SCM s1, SCM s2);
-extern SCM scm_string_ci_leq_p (SCM s1, SCM s2);
-extern SCM scm_string_ci_gr_p (SCM s1, SCM s2);
-extern SCM scm_string_ci_geq_p (SCM s1, SCM s2);
-extern void scm_init_strorder (void);
-
-#else /* STDC */
-extern SCM scm_string_equal_p ();
-extern SCM scm_string_ci_equal_p ();
-extern SCM scm_string_less_p ();
-extern SCM scm_string_leq_p ();
-extern SCM scm_string_gr_p ();
-extern SCM scm_string_geq_p ();
-extern SCM scm_string_ci_less_p ();
-extern SCM scm_string_ci_leq_p ();
-extern SCM scm_string_ci_gr_p ();
-extern SCM scm_string_ci_geq_p ();
-extern void scm_init_strorder ();
-
-#endif /* STDC */
-
 
+extern SCM scm_string_equal_p SCM_P ((SCM s1, SCM s2));
+extern SCM scm_string_ci_equal_p SCM_P ((SCM s1, SCM s2));
+extern SCM scm_string_less_p SCM_P ((SCM s1, SCM s2));
+extern SCM scm_string_leq_p SCM_P ((SCM s1, SCM s2));
+extern SCM scm_string_gr_p SCM_P ((SCM s1, SCM s2));
+extern SCM scm_string_geq_p SCM_P ((SCM s1, SCM s2));
+extern SCM scm_string_ci_less_p SCM_P ((SCM s1, SCM s2));
+extern SCM scm_string_ci_leq_p SCM_P ((SCM s1, SCM s2));
+extern SCM scm_string_ci_gr_p SCM_P ((SCM s1, SCM s2));
+extern SCM scm_string_ci_geq_p SCM_P ((SCM s1, SCM s2));
+extern void scm_init_strorder SCM_P ((void));
 
 #endif  /* STRORDERH */