Merge pull request #14 from h2o/kazuho/no-auto-include

add preprocessor flag to disable automatic inclusion of qrintf.h and some standard headers
h2o · May 9, 2015 · b8ca552 · b8ca552
2 parents b1c9a49 + 2c92cd3
commit b8ca552
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git 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 → include/qrintf.h b/share/qrintf/qrintf.h → 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" {