fix includes, most externs for windows

include/exppp/exppp.h

@@ -1,7 +1,7 @@
 #ifndef EXPPP_H
 #define EXPPP_H
 
-#include <stdbool.h>
+#include <sc_stdbool.h>
 
 #include <sc_export.h>
 
@@ -64,6 +64,6 @@ SC_EXPPP_EXPORT int TYPEbody_to_buffer( Type t, char * buffer, int length );
 SC_EXPPP_EXPORT int WHEREto_buffer( Linked_List w, char * buffer, int length );
 
 SC_EXPPP_EXPORT int EXPRlength( Expression e );
-SC_EXPPP_EXPORT int count_newlines( char * s );
+extern SC_EXPPP_EXPORT int count_newlines( char * s );
 
 #endif

src/exppp/exppp-main.c

@@ -3,8 +3,7 @@
 #include "../express/express.h"
 #include "exppp.h"
 
-static void
-exppp_usage() {
+static void exppp_usage( void ) {
     fprintf( stderr, "usage: %s [-a|A] [-v] [-d #] [-p <object_type>] {-w|-i <warning>} [-l <length>] [-c] [-o [file|--]] express_file\n", EXPRESSprogram_name );
     fprintf( stderr, "where\t-a or -A causes output to be alphabetized\n" );
     fprintf( stderr, "\t-v produces a version description\n" );

src/exppp/pp.h

@@ -4,16 +4,12 @@
 #ifndef PP_H
 #define PP_H
 
-#include <stdbool.h>
-#include <../express/symbol.h>
+#include <sc_stdbool.h>
+#include <express/symbol.h>
 
-extern int exppp_linelength;                    /**< leave some room for closing parens.
-                                                  * '\n' is not included in this count either */
 extern int indent2;                             /**< where continuation lines start */
 extern int curpos;                              /**< current line position (1 is first position) */
 extern const int NOLEVEL;                       /**< unused-level indicator */
-extern const int exppp_nesting_indent;          /**< default nesting indent */
-extern const int exppp_continuation_indent;     /**< default nesting indent for continuation lines */
 
 extern Symbol error_sym;                        /**< only used when printing errors */
 extern Error ERROR_select_empty;
@@ -58,7 +54,6 @@ void first_newline();
 void prep_file();
 char * finish_string();
 const char * real2exp( double r );
-int count_newlines( char * s );
 void exp_output( char * buf, int len );
 void exppp_init();
 void exppp_ref_info( Symbol * s );

src/exppp/pretty_alg.c

@@ -5,6 +5,7 @@
 
 #include <express/scope.h>
 #include <express/linklist.h>
+#include <exppp/exppp.h>
 
 #include "pp.h"
 #include "pretty_type.h"

src/exppp/pretty_case.c

@@ -3,6 +3,7 @@
  */
 
 #include <express/linklist.h>
+#include <exppp/exppp.h>
 
 #include "pp.h"
 #include "pretty_expr.h"

src/exppp/pretty_expr.c

@@ -4,7 +4,7 @@
  */
 
 #include <stdio.h>
-#include <stdbool.h>
+#include <sc_stdbool.h>
 #include <stdlib.h>
 
 #include "exppp.h"

src/exppp/pretty_express.c

@@ -3,6 +3,7 @@
  */
 
 #include <express/express.h>
+#include <exppp/exppp.h>
 
 #include "pp.h"
 #include "pretty_schema.h"

src/exppp/pretty_loop.c

@@ -4,6 +4,7 @@
 
 #include <express/variable.h>
 #include <express/dict.h>
+#include <exppp/exppp.h>
 
 #include "pp.h"
 #include "pretty_expr.h"

src/exppp/pretty_ref.c

@@ -3,6 +3,8 @@
  */
 
 #include <express/schema.h>
+#include <exppp/exppp.h>
+
 #include "pp.h"
 #include "pretty_ref.h"
 

src/exppp/pretty_schema.c

@@ -6,6 +6,7 @@
 #include <errno.h>
 
 #include <sc_version_string.h>
+#include <express/express.h>
 
 #include <exppp/exppp.h>
 #include "pp.h"

src/exppp/pretty_stmt.c

@@ -2,6 +2,7 @@
  * split out of exppp.c 9/21/13
  */
 
+#include <exppp/exppp.h>
 #include "pp.h"
 #include "pretty_expr.h"
 #include "pretty_case.h"

src/exppp/pretty_where.c

@@ -4,6 +4,7 @@
  */
 
 #include <express/alg.h>
+#include <exppp/exppp.h>
 
 #include "pp.h"
 #include "pretty_expr.h"