apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r125062 - /apr/apr/trunk/acconfig.h /apr/apr/trunk/build/apr_common.m4 /apr/apr/trunk/configure.in /apr/apr/trunk/threadproc/unix/signals.c
Date Thu, 13 Jan 2005 11:15:09 GMT
Author: jorton
Date: Thu Jan 13 03:15:04 2005
New Revision: 125062

URL: http://svn.apache.org/viewcvs?view=rev&rev=125062
Log:
* acconfig.h: Remove file.

* configure.in: Use autoheader AH_BOTTOM macro to hard-code tail end
of apr_private.h.

* threadproc/unix/signals.c (apr_sigwait): Define here rather than in
apr_private.h since it's only used here.

* build/apr_common.m4 (APR_DECIDE): AC_DEFUN the macro, use
AH_TEMPLATE to define the template for apr_private.h.

Removed:
   apr/apr/trunk/acconfig.h
Modified:
   apr/apr/trunk/build/apr_common.m4
   apr/apr/trunk/configure.in
   apr/apr/trunk/threadproc/unix/signals.c

Deleted: /apr/apr/trunk/acconfig.h
Url: http://svn.apache.org/viewcvs/apr/apr/trunk/acconfig.h?view=auto&rev=125061
==============================================================================

Modified: apr/apr/trunk/build/apr_common.m4
Url: http://svn.apache.org/viewcvs/apr/apr/trunk/build/apr_common.m4?view=diff&rev=125062&p1=apr/apr/trunk/build/apr_common.m4&r1=125061&p2=apr/apr/trunk/build/apr_common.m4&r2=125062
==============================================================================
--- apr/apr/trunk/build/apr_common.m4	(original)
+++ apr/apr/trunk/build/apr_common.m4	Thu Jan 13 03:15:04 2005
@@ -379,7 +379,9 @@
 ])
 
 
-define(APR_DECIDE,[dnl
+AC_DEFUN([APR_DECIDE],[dnl
+dnl Define the flag (or not) in apr_private.h via autoheader
+AH_TEMPLATE($1, [Define if $2 will be used])
 ac_decision='$1'
 ac_decision_msg='$2'
 ac_decision_$1=yes

Modified: apr/apr/trunk/configure.in
Url: http://svn.apache.org/viewcvs/apr/apr/trunk/configure.in?view=diff&rev=125062&p1=apr/apr/trunk/configure.in&r1=125061&p2=apr/apr/trunk/configure.in&r2=125062
==============================================================================
--- apr/apr/trunk/configure.in	(original)
+++ apr/apr/trunk/configure.in	Thu Jan 13 03:15:04 2005
@@ -20,6 +20,27 @@
 sinclude(build/libtool.m4)
 sinclude(build/ltsugar.m4)
 
+dnl Hard-coded inclusion at the tail end of apr_private.h:
+AH_BOTTOM([
+/* switch this on if we have a BeOS version below BONE */
+#if BEOS && !HAVE_BONE_VERSION
+#define BEOS_R5 1
+#else
+#define BEOS_BONE 1
+#endif
+
+#ifdef SIGWAIT_TAKES_ONE_ARG
+#define apr_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0)
+#else
+#define apr_sigwait(a,b) sigwait((a),(b))
+#endif
+
+/*
+ * Include common private declarations.
+ */
+#include "../apr_private_common.h"
+])
+
 dnl Save user-defined environment settings for later restoration
 dnl
 APR_SAVE_THE_ENVIRONMENT(CPPFLAGS)

Modified: apr/apr/trunk/threadproc/unix/signals.c
Url: http://svn.apache.org/viewcvs/apr/apr/trunk/threadproc/unix/signals.c?view=diff&rev=125062&p1=apr/apr/trunk/threadproc/unix/signals.c&r1=125061&p2=apr/apr/trunk/threadproc/unix/signals.c&r2=125062
==============================================================================
--- apr/apr/trunk/threadproc/unix/signals.c	(original)
+++ apr/apr/trunk/threadproc/unix/signals.c	Thu Jan 13 03:15:04 2005
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,12 @@
 #include <assert.h>
 #if APR_HAS_THREADS && APR_HAVE_PTHREAD_H
 #include <pthread.h>
+#endif
+
+#ifdef SIGWAIT_TAKES_ONE_ARG
+#define apr_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0)
+#else
+#define apr_sigwait(a,b) sigwait((a),(b))
 #endif
 
 APR_DECLARE(apr_status_t) apr_proc_kill(apr_proc_t *proc, int signum)

Mime
View raw message