diff --git a/bin/qrintf b/bin/qrintf index 1a51dc0..c94020d 100755 --- a/bin/qrintf +++ b/bin/qrintf @@ -33,7 +33,7 @@ $tempfn =~ s{\.c(.*)$}{.i@{[$1 ? 'i' : '']}}s $tempfn = "$tempdir/$tempfn"; # invoke cpp -open(my $fh, "-|", $cc, '-E', (grep { $_ ne '-c' } @cflags), '-DQRINTF=1', '-include', "$pwd/../share/qrintf/qrintf.h", $fn) +open(my $fh, "-|", $cc, '-E', (grep { $_ ne '-c' } @cflags), '-DQRINTF=1', '-include', "$pwd/../include/qrintf.h", $fn) or die "failed to invoke $cc -E:$!"; my $src = do { local $/; <$fh> }; close $fh diff --git a/share/qrintf/qrintf.h b/include/qrintf.h similarity index 99% rename from share/qrintf/qrintf.h rename to include/qrintf.h index 2260936..3bf48ba 100644 --- a/share/qrintf/qrintf.h +++ b/include/qrintf.h @@ -20,8 +20,17 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#ifndef qrintf_h -#define qrintf_h +#if !defined(QRINTF_INCLUDE_COUNT) +# define QRINTF_INCLUDE_COUNT 1 +#elif QRINTF_INCLUDE_COUNT==1 +# undef QRINTF_INCLUDE_COUNT +# define QRINTF_INCLUDE_COUNT 2 +#elif QRINTF_INCLUDE_COUNT==2 +# undef QRINTF_INCLUDE_COUNT +# define QRINTF_INCLUDE_COUNT 3 +#endif + +#if (!defined(QRINTF_NO_AUTO_INCLUDE) && QRINTF_INCLUDE_COUNT==1) || (defined(QRINTF_NO_AUTO_INCLUDE) && QRINTF_INCLUDE_COUNT==2) #ifdef __cplusplus extern "C" {