X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcycle-check.h;h=afd7a8f2b962f9ccfcc230759b891ec90ff7177d;hb=c68c756f05b4d51ffa5a12b391ff996990deee14;hp=b137a60a85a63ada4f98d665cba77826ac2f4130;hpb=79c0a43808d9ca85acd04600149fc1a9b75bd1b9;p=gnulib.git

diff --git a/lib/cycle-check.h b/lib/cycle-check.h
index b137a60a8..afd7a8f2b 100644
--- a/lib/cycle-check.h
+++ b/lib/cycle-check.h
@@ -22,12 +22,7 @@
 #ifndef CYCLE_CHECK_H
 # define CYCLE_CHECK_H 1
 
-# if HAVE_INTTYPES_H
-#  include <inttypes.h>
-# endif
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
+# include <stdint.h>
 # include <stdbool.h>
 # include "dev-ino.h"
 # include "same-inode.h"
@@ -45,6 +40,9 @@ bool cycle_check (struct cycle_check_state *state, struct stat const *sb);
 # define CYCLE_CHECK_REFLECT_CHDIR_UP(State, SB_dir, SB_subdir)	\
   do								\
     {								\
+      /* You must call cycle_check at least once before using this macro.  */ \
+      if ((State)->chdir_counter == 0)				\
+        abort ();						\
       if (SAME_INODE ((State)->dev_ino, SB_subdir))		\
 	{							\
 	  (State)->dev_ino.st_dev = (SB_dir).st_dev;		\