WIPnew-build

18 files changed, 11 insertions, 21 deletions

diff --git a/src/lib/XDither.c b/src/lib/XDither.c
index d766633d..aac711f8 100644
--- a/src/lib/XDither.c
+++ b/src/lib/XDither.c
@@ -33,7 +33,6 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "openaxiom-c-macros.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/lib/XShade.c b/src/lib/XShade.c
index 590f2d2f..a5851f69 100644
--- a/src/lib/XShade.c
+++ b/src/lib/XShade.c
@@ -33,7 +33,6 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "openaxiom-c-macros.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/lib/XSpadFill.c b/src/lib/XSpadFill.c
index 566c57ce..0b2212e5 100644
--- a/src/lib/XSpadFill.c
+++ b/src/lib/XSpadFill.c
@@ -58,7 +58,6 @@
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 
-#include "openaxiom-c-macros.h"
 #include "spadcolors.h"
 #include "XSpadFill.h"
 #include "XShade.h"
diff --git a/src/lib/bsdsignal.cxx b/src/lib/bsdsignal.cxx
index 07fc6b54..66e4dcd0 100644
--- a/src/lib/bsdsignal.cxx
+++ b/src/lib/bsdsignal.cxx
@@ -33,7 +33,6 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "openaxiom-c-macros.h"
 #include <signal.h> 
 #include "bsdsignal.h"
 
diff --git a/src/lib/cfuns-c.cxx b/src/lib/cfuns-c.cxx
index 5dbcd6bc..5cb5f338 100644
--- a/src/lib/cfuns-c.cxx
+++ b/src/lib/cfuns-c.cxx
@@ -34,7 +34,9 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "openaxiom-c-macros.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <errno.h>
 #include <limits.h>
@@ -501,11 +503,11 @@ oa_acquire_temporary_pathname() {
    }
    return strdup(buf);
 #elif HAVE_DECL_MKTEMP
-   return mktemp(copy_c_str(std::string{ oa_get_tmpdir() } + "/oa-XXXXXX"));
+   return mktemp(strdup((std::string{ oa_get_tmpdir() } + "/oa-XXXXXX").c_str()));
 #elif HAVE_DECL_TEMPNAM
    return tempnam(oa_get_tmpdir(), "oa-");
 #else
-   return copy_c_str("oa-" + std::to_string(random()));
+   return strdup(("oa-" + std::to_string(random())).c_str());
 #endif   
 }
 
diff --git a/src/lib/cursor.c b/src/lib/cursor.cc
index 5413151d..af0b6603 100644
--- a/src/lib/cursor.c
+++ b/src/lib/cursor.cc
@@ -34,7 +34,6 @@
 */
 
 #include <stdlib.h>
-#include "openaxiom-c-macros.h"
 
 #include "cursor.h"
 
diff --git a/src/lib/edin.c b/src/lib/edin.cc
index 568bb77a..7fee5176 100644
--- a/src/lib/edin.c
+++ b/src/lib/edin.cc
@@ -36,7 +36,6 @@
 /* #define debug 1 */
 
 #include <stdlib.h>
-#include "openaxiom-c-macros.h"
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/lib/emupty.c b/src/lib/emupty.c
index 7ddfbd2d..9b9848c9 100644
--- a/src/lib/emupty.c
+++ b/src/lib/emupty.c
@@ -31,7 +31,6 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "openaxiom-c-macros.h"
 
 /*
   Here is some code taken from Nick Simicich. It takes an escape sequence
diff --git a/src/lib/fnct_key.c b/src/lib/fnct_key.cc
index f70bc430..af0d5c28 100644
--- a/src/lib/fnct_key.c
+++ b/src/lib/fnct_key.cc
@@ -33,7 +33,6 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "openaxiom-c-macros.h"
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/lib/halloc.c b/src/lib/halloc.c
index 4b19c60a..fb43d6b3 100644
--- a/src/lib/halloc.c
+++ b/src/lib/halloc.c
@@ -31,7 +31,6 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "openaxiom-c-macros.h"
 
 /* memory allocation used by HyperDoc and addfile */
 
diff --git a/src/lib/hash.c b/src/lib/hash.c
index 837eb8b1..7f727ecf 100644
--- a/src/lib/hash.c
+++ b/src/lib/hash.c
@@ -32,7 +32,6 @@
 */
 
 
-#include "openaxiom-c-macros.h"
 #define _HASH_C
 #include "debug.h"
 
diff --git a/src/lib/openpty.c b/src/lib/openpty.cc
index 5918aa7a..4262832e 100644
--- a/src/lib/openpty.c
+++ b/src/lib/openpty.cc
@@ -33,7 +33,10 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "openaxiom-c-macros.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/src/lib/pixmap.c b/src/lib/pixmap.c
index d0ad2097..da169dfb 100644
--- a/src/lib/pixmap.c
+++ b/src/lib/pixmap.c
@@ -33,7 +33,6 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "openaxiom-c-macros.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/src/lib/prt.c b/src/lib/prt.cc
index ee5b3af0..831a199e 100644
--- a/src/lib/prt.c
+++ b/src/lib/prt.cc
@@ -31,7 +31,6 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "openaxiom-c-macros.h"
 #include <string.h>
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/src/lib/sockio-c.cxx b/src/lib/sockio-c.cxx
index dda95ec3..c17c3398 100644
--- a/src/lib/sockio-c.cxx
+++ b/src/lib/sockio-c.cxx
@@ -70,9 +70,9 @@ namespace OpenAxiom {
 /* Note that the name AF_LOCAL is more portable than AF_UNIX, but MingW
    implementation and Windows documentation don't always agree.  */
 
-#if HAVE_AF_LOCAL
+#if HAVE_DECL_AF_LOCAL
 #  define OPENAXIOM_AF_LOCAL AF_LOCAL
-#elif HAVE_AF_UNIX
+#elif HAVE_DECL_AF_UNIX
 #  define OPENAXIOM_AF_LOCAL AF_UNIX
 #else
 #  error "needs one of AF_LOCAL or AF_UNIX"
diff --git a/src/lib/spadcolors.c b/src/lib/spadcolors.c
index b8d784f2..8007b450 100644
--- a/src/lib/spadcolors.c
+++ b/src/lib/spadcolors.c
@@ -33,7 +33,6 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "openaxiom-c-macros.h"
 #include "spadcolors.h"
 
 #include <X11/Xlib.h>
diff --git a/src/lib/util.c b/src/lib/util.c
index 198cd3bf..264590ea 100644
--- a/src/lib/util.c
+++ b/src/lib/util.c
@@ -33,7 +33,6 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "openaxiom-c-macros.h"
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/src/lib/wct.c b/src/lib/wct.cc
index 44510558..bac8c894 100644
--- a/src/lib/wct.c
+++ b/src/lib/wct.cc
@@ -41,7 +41,6 @@
  *
  */
 
-#include "openaxiom-c-macros.h"
 
 #include <stdio.h>
 #include <stdlib.h>