Minor changes for python binding.

ma-tech · Apr 25, 2018 · e5de159 · e5de159
1 parent 58521e7
commit e5de159
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/libAlc/AlcType.h b/libAlc/AlcType.h
@@ -50,6 +50,7 @@ extern "C" {
 /************************************************************************
 * Portability macros.                                                   *
 ************************************************************************/
+#ifndef CTYPESGEN
 #ifdef HAVE_STRTOK_R
 #define ALC_STRTOK_R(S,D,P)     strtok_r((S),(D),(P))
 #else
@@ -69,6 +70,7 @@ extern "C" {
   } \
 }
 #endif
+#endif
 
 
 /*!

diff --git a/libAlg/AlgProto.h b/libAlg/AlgProto.h
@@ -155,8 +155,10 @@ extern void            		AlgCrossCorrPeakY(
 				  int nY);
 
 /* From AlgDebug.c */
+#ifndef CTYPESGEN
 extern AlgError			AlgDbgWrite(
 				  char *fmt, ...);
+#endif
 
 /* From AlgFourier.c */
 extern void     		AlgFourHart1D(
@@ -871,12 +873,14 @@ extern int AlgDPSearch(int, int, double **, double **, int **,
 		       double (*)(int, int, int, int **));
 
 /* Debugging */
+#ifndef CTYPESGEN
 extern AlgDbgMask	 	algDbgMask;
 extern void			*algDbgData;
 extern AlgDbgFn			algDbgOutFn;
 extern AlgError			AlgDbgWrite(
 				  char *,
 				  ...);
+#endif
 
 #ifndef WLZ_EXT_BIND
 #ifdef  __cplusplus

diff --git a/libAlg/AlgType.h b/libAlg/AlgType.h
@@ -287,11 +287,13 @@ typedef enum _AlgDbgMask
   ALG_DBG_LVL_FN        = (1<<3)
 } AlgDbgMask;
 
+#ifndef CTYPESGEN
 typedef AlgError        (*AlgDbgFn)(char *, ...);
 
 extern AlgDbgFn		algDbgOutFn;
 #define ALG_DBG_FN      (*algDbgOutFn)
 #define ALG_DBG(F,M)    ((((F)&(algDbgMask))==(F))?ALG_DBG_FN M:ALG_ERR_NONE)
+#endif
 
 #ifndef WLZ_EXT_BIND
 #ifdef  __cplusplus 

diff --git a/libWlz/WlzProto.h b/libWlz/WlzProto.h
@@ -6198,6 +6198,7 @@ extern WlzErrorNum  		WlzStringToErrorNum(
 /************************************************************************
 * WlzStringUtils.c							*
 ************************************************************************/
+#ifndef CTYPESGEN
 #ifndef WLZ_EXT_BIND
 extern int 			WlzStringMatchValue(
 				  int *dstValue,
@@ -6226,6 +6227,7 @@ extern char			*WlzStringCopyReplace(
 				  int inPlace);
 
 #endif /* WLZ_EXT_BIND */
+#endif
 
 /************************************************************************
 * WlzStructDilation.c							*