for redefines function-style macros are safer

better indentation for include files

src/include/longpath/longpath.h

@@ -133,96 +133,96 @@ extern "C" {
 
 /* func -> func64 */
 #if !defined(_LP64) && _FILE_OFFSET_BITS == 64
- #ifdef __PRAGMA_REDEFINE_EXTNAME
-  #pragma redefine_extname        openl		openl64
-  #pragma redefine_extname        creatl	creatl64
-  #pragma redefine_extname        statl		statl64
-  #if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ||	\
-	  defined(_ATFILE_SOURCE)
-   #pragma redefine_extname        openatl	openatl64
-#ifdef HAVE_ATTROPEN
-   #pragma redefine_extname        attropenl	attropenl64
-#endif
-   #pragma redefine_extname        fstatatl	fstatatl64
-  #endif /* defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ... */
-  #if !defined(__XOPEN_OR_POSIX) || defined(_XPG_2) || defined(__EXTENSIONS__)
-   #pragma redefine_extname        lstatl	lstatl64
-  #endif
-  #pragma redefine_extname        mkstempl	mkstempl64
-  #pragma redefine_extname        mkstempsl	mkstempsl64
-  #if defined(_GNU_SOURCE)
-   #pragma redefine_extname        mkostempl	mkostempl64
-   #pragma redefine_extname        mkostempsl	mkostempsl64
-  #endif
- #else /* __PRAGMA_REDEFINE_EXTNAME */
-  #define        openl		openl64
-  #define        creatl		creatl64
-  #define        statl		statl64
-  #if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ||	\
-	  defined(_ATFILE_SOURCE)
-   #define        openatl	openatl64
-#ifdef HAVE_ATTROPEN
-   #define        attropenl	attropenl64
-#endif
-   #define        fstatatl	fstatatl64
-  #endif /* defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ... */
-  #if !defined(__XOPEN_OR_POSIX) || defined(_XPG_2) || defined(__EXTENSIONS__)
-   #define        lstatl	lstatl64
-  #endif
-  #define        mkstempl	mkstempl64
-  #define        mkstempsl	mkstempsl64
-  #if defined(_GNU_SOURCE)
-   #define        mkostempl	mkostempl64
-   #define        mkostempsl	mkostempsl64
-  #endif
- #endif  /* __PRAGMA_REDEFINE_EXTNAME */
+# ifdef __PRAGMA_REDEFINE_EXTNAME
+#  pragma redefine_extname	openl		openl64
+#  pragma redefine_extname	creatl		creatl64
+#  pragma redefine_extname	statl		statl64
+#  if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ||	\
+	defined(_ATFILE_SOURCE)
+#   pragma redefine_extname	openatl		openatl64
+#   ifdef HAVE_ATTROPEN
+#    pragma redefine_extname	attropenl	attropenl64
+#   endif
+#   pragma redefine_extname	fstatatl	fstatatl64
+#  endif /* defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ... */
+#  if !defined(__XOPEN_OR_POSIX) || defined(_XPG_2) || defined(__EXTENSIONS__)
+#   pragma redefine_extname	lstatl		lstatl64
+#  endif
+#  pragma redefine_extname	mkstempl	mkstempl64
+#  pragma redefine_extname	mkstempsl	mkstempsl64
+#  if defined(_GNU_SOURCE)
+#   pragma redefine_extname	mkostempl	mkostempl64
+#   pragma redefine_extname	mkostempsl	mkostempsl64
+#  endif
+# else /* __PRAGMA_REDEFINE_EXTNAME */
+#  define	openl(p, f, ...)		openl64(p, f, ##__VA_ARGS__)
+#  define	creatl(p, m)			creatl64(p, m)
+#  define	statl(p, s)   			statl64(p, s)
+#  if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ||	\
+	defined(_ATFILE_SOURCE)
+#   define	openatl(fd, p, f, ...)		openatl64(fd, p, f, ##__VA_ARGS__)
+#   ifdef HAVE_ATTROPEN
+#    define	attropenl(p, ap, f, ...)	attropenl64(p, ap, f, ##__VA_ARGS__)
+#   endif
+#   define	fstatatl(fd, p, s, f)		fstatatl64(fd, p, s, f)
+#  endif /* defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ... */
+#  if !defined(__XOPEN_OR_POSIX) || defined(_XPG_2) || defined(__EXTENSIONS__)
+#   define	lstatl(p, s)			lstatl64(p, s)
+#  endif
+#  define	mkstempl(t)			mkstempl64(t)
+#  define	mkstempsl(t, l)			mkstempsl64(t, l)
+#  if defined(_GNU_SOURCE)
+#   define	mkostempl(t, f)			mkostempl64(t, f)
+#   define	mkostempsl(t, l, f)		mkostempsl64(t, l, f)
+#  endif
+# endif  /* __PRAGMA_REDEFINE_EXTNAME */
 #endif  /* !_LP64 && _FILE_OFFSET_BITS == 64 */
 
 /* func64 -> func */
 #if defined(_LP64) && defined(_LARGEFILE64_SOURCE)
- #ifdef __PRAGMA_REDEFINE_EXTNAME
-  #pragma redefine_extname        openl64	openl
-  #pragma redefine_extname        creatl64	creatl
-  #pragma redefine_extname        statl64	statl
-  #if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ||	\
-	  defined(_ATFILE_SOURCE)
-   #pragma redefine_extname        openatl64	openatl
-#ifdef HAVE_ATTROPEN
-   #pragma redefine_extname        attropenl64	attropenl
-#endif
-   #pragma redefine_extname        fstatatl64	fstatatl
-  #endif /* defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ... */
-  #if !defined(__XOPEN_OR_POSIX) || defined(_XPG_2) || defined(__EXTENSIONS__)
-   #pragma redefine_extname        lstatl64	lstatl
-  #endif
-  #pragma redefine_extname        mkstempl64	mkstempl
-  #pragma redefine_extname        mkstempsl64	mkstempsl
-  #if defined(_GNU_SOURCE)
-   #pragma redefine_extname        mkostempl64	mkostempl
-   #pragma redefine_extname        mkostempsl64	mkostempsl
-  #endif
- #else /* __PRAGMA_REDEFINE_EXTNAME */
-  #define        openl64	openl
-  #define        creatl64	creatl
-  #define        statl64	statl
-  #if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ||	\
-	  defined(_ATFILE_SOURCE)
-   #define        openatl64	openatl
-#ifdef HAVE_ATTROPEN
-   #define        attropenl64	attropenl
-#endif
-   #define        fstatatl64	fstatatl
-  #endif /* defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ... */
-  #if !defined(__XOPEN_OR_POSIX) || defined(_XPG_2) || defined(__EXTENSIONS__)
-   #define        lstatl64	lstatl
-  #endif
-  #define        mkstempl64	mkstempl
-  #define        mkstempsl64	mkstempsl
-  #if defined(_GNU_SOURCE)
-   #define        mkostempl64	mkostempl
-   #define        mkostempsl64	mkostempsl
-  #endif
- #endif  /* __PRAGMA_REDEFINE_EXTNAME */
+# ifdef __PRAGMA_REDEFINE_EXTNAME
+#  pragma redefine_extname	openl64		openl
+#  pragma redefine_extname	creatl64	creatl
+#  pragma redefine_extname	statl64		statl
+#  if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ||	\
+	defined(_ATFILE_SOURCE)
+#   pragma redefine_extname	openatl64	openatl
+#   ifdef HAVE_ATTROPEN
+#    pragma redefine_extname	attropenl64	attropenl
+#   endif
+#   pragma redefine_extname	fstatatl64	fstatatl
+#  endif /* defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ... */
+#  if !defined(__XOPEN_OR_POSIX) || defined(_XPG_2) || defined(__EXTENSIONS__)
+#   pragma redefine_extname	lstatl64	lstatl
+#  endif
+#  pragma redefine_extname	mkstempl64	mkstempl
+#  pragma redefine_extname	mkstempsl64	mkstempsl
+#  if defined(_GNU_SOURCE)
+#   pragma redefine_extname	mkostempl64	mkostempl
+#   pragma redefine_extname	mkostempsl64	mkostempsl
+#  endif
+# else /* __PRAGMA_REDEFINE_EXTNAME */
+#  define	openl64(p, f, ...)		openl(p, f, ##__VA_ARGS__)
+#  define	creatl64(p, m)			creatl(p, m)
+#  define	statl64(p, s)			statl(p, s)
+#  if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ||	\
+	defined(_ATFILE_SOURCE)
+#   define	openatl64(fd, p, f, ...)	openatl(fd, p, f, ##__VA_ARGS__)
+#   ifdef HAVE_ATTROPEN
+#    define	attropenl64(p, ap, f, ...)	attropenl(p, ap, f, ##__VA_ARGS__)
+#   endif
+#   define	fstatatl64(fd, p, s, f)		fstatatl(fd, p, s, f)
+#  endif /* defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ... */
+#  if !defined(__XOPEN_OR_POSIX) || defined(_XPG_2) || defined(__EXTENSIONS__)
+#   define	lstatl64(p, s)			lstatl(p, s)
+#  endif
+#  define	mkstempl64(t)			mkstempl(t)
+#  define	mkstempsl64(t, l)		mkstempsl(t, l)
+#  if defined(_GNU_SOURCE)
+#   define	mkostempl64(t, f)		mkostempl(t, f)
+#   define	mkostempsl64(t, l, f)		mkostempsl(t, l, f)
+#  endif
+# endif  /* __PRAGMA_REDEFINE_EXTNAME */
 #endif  /* _LP64 && _LARGEFILE64_SOURCE */
 
 #if defined(__STDC__)