From: pravin Date: Mon, 5 Apr 2010 18:50:34 +0000 (-0700) Subject: b=20339 Remove LPSZ definition. X-Git-Tag: 1.10.0.40~12 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=2903b9734fd36ca2c115926abadc9632264a3d89 b=20339 Remove LPSZ definition. a=andreas.dilger i=alexey.lyashkov i=pravin --- diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index 4c8e400..12bb65c 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -213,56 +213,6 @@ LB_LINUX_TRY_COMPILE([ EXTRA_KCFLAGS="$tmp_flags" ]) -# check userland size_t type -AC_DEFUN([LIBCFS_SIZE_T_LONG], -[AC_MSG_CHECKING([size_t is unsigned long type]) -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -Werror" -AC_COMPILE_IFELSE([ - #include - #include - int main(void) { - unsigned long *data1; - size_t *data2 = NULL; - - data1 = data2; - return 0; - } -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SIZE_T_LONG, 1, - [size_t is long type]) -],[ - AC_MSG_RESULT([no]) -]) -CFLAGS="$tmp_flags" -]) - -AC_DEFUN([LIBCFS_SSIZE_T_LONG], -[AC_MSG_CHECKING([ssize_t is signed long type]) -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -Werror" -AC_COMPILE_IFELSE([ - #include - #include - int main(void) { - long *data1; - ssize_t *data2 = NULL; - - data1 = data2; - return 0; - } -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SSIZE_T_LONG, 1, - [ssize_t is long type]) -],[ - AC_MSG_RESULT([no]) -]) -CFLAGS="$tmp_flags" -]) - - # check if task_struct with rcu memeber AC_DEFUN([LIBCFS_TASK_RCU], [AC_MSG_CHECKING([if task_struct has a rcu field]) diff --git a/libcfs/include/libcfs/darwin/kp30.h b/libcfs/include/libcfs/darwin/kp30.h index a1768af..e33f79f 100644 --- a/libcfs/include/libcfs/darwin/kp30.h +++ b/libcfs/include/libcfs/darwin/kp30.h @@ -119,8 +119,6 @@ typedef struct { #define LPU64 "%llu" #define LPD64 "%lld" #define LPX64 "%#llx" -#define LPSZ "%lu" -#define LPSSZ "%ld" # define LI_POISON ((int)0x5a5a5a5a) # define LL_POISON ((long)0x5a5a5a5a) # define LP_POISON ((void *)(long)0x5a5a5a5a) diff --git a/libcfs/include/libcfs/linux/kp30.h b/libcfs/include/libcfs/linux/kp30.h index 3b4c44b..f1b4360 100644 --- a/libcfs/include/libcfs/linux/kp30.h +++ b/libcfs/include/libcfs/linux/kp30.h @@ -372,20 +372,6 @@ extern int lwt_snapshot (cfs_cycles_t *now, int *ncpu, int *total_size, */ # define LPPID "%d" -#ifdef HAVE_SIZE_T_LONG -# define LPSZ "%lu" -# define LPSZX "%lx" -#else -# define LPSZ "%u" -# define LPSZX "%x" -#endif - -#ifdef HAVE_SSIZE_T_LONG -# define LPSSZ "%ld" -#else -# define LPSSZ "%d" -#endif - #ifndef LPU64 # error "No word size defined" #endif diff --git a/libcfs/include/libcfs/posix/posix-wordsize.h b/libcfs/include/libcfs/posix/posix-wordsize.h index 64500a54..f675960 100644 --- a/libcfs/include/libcfs/posix/posix-wordsize.h +++ b/libcfs/include/libcfs/posix/posix-wordsize.h @@ -134,20 +134,6 @@ typedef struct { # define LPF64 "l" #endif -#ifdef HAVE_SIZE_T_LONG -# define LPSZ "%lu" -# define LPSZX "%lx" -#else -# define LPSZ "%u" -# define LPSZX "%x" -#endif - -#ifdef HAVE_SSIZE_T_LONG -# define LPSSZ "%ld" -#else -# define LPSSZ "%d" -#endif - #ifndef LPU64 # error "No word size defined" #endif diff --git a/libcfs/include/libcfs/winnt/kp30.h b/libcfs/include/libcfs/winnt/kp30.h index 707f748..996ec6c 100644 --- a/libcfs/include/libcfs/winnt/kp30.h +++ b/libcfs/include/libcfs/winnt/kp30.h @@ -150,8 +150,6 @@ typedef struct { #define LPU64 "%I64u" #define LPD64 "%I64d" #define LPX64 "%#I64x" -#define LPSZ "%lu" -#define LPSSZ "%ld" /* * long_ptr_t & ulong_ptr_t, same to "long" for linux diff --git a/lustre/include/darwin/lustre_user.h b/lustre/include/darwin/lustre_user.h index ad78b91..4756186 100644 --- a/lustre/include/darwin/lustre_user.h +++ b/lustre/include/darwin/lustre_user.h @@ -63,14 +63,10 @@ typedef struct stat lstat_t; # define LPU64 "%llu" # define LPD64 "%lld" # define LPX64 "%#llx" -# define LPSZ "%u" -# define LPSSZ "%d" #elif (BITS_PER_LONG == 64 || __WORDSIZE == 64) # define LPU64 "%lu" # define LPD64 "%ld" # define LPX64 "%#lx" -# define LPSZ "%lu" -# define LPSSZ "%ld" #endif #endif /* !LPU64 */