these are the bits from the large patch that didn't fit in the
previous ones, and have no relation to the upcoming strl* introduction
either.
pretty much only formatting.
>From 371351d22e85ef286d5eb077d0afbef1da765aa7 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <[email protected]>
Date: Thu, 23 Sep 2010 17:09:46 +0200
Subject: [PATCH] Small assorted formatting changes
Signed-off-by: Tamas TEVESZ <[email protected]>
---
WINGs/dragsource.c | 2 +-
WINGs/wsplitview.c | 3 ++-
configure.ac | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/WINGs/dragsource.c b/WINGs/dragsource.c
index eea0ef5..c1ea68a 100644
--- a/WINGs/dragsource.c
+++ b/WINGs/dragsource.c
@@ -478,7 +478,7 @@ static void registerDescriptionList(WMScreen * scr, WMView
* view, WMArray * ope
/* size of XA_STRING info */
for (i = 0; i < count; i++) {
- size +=
strlen(WMGetDragOperationItemText(WMGetFromArray(operationArray, i))) + 1;
/* +1 = +NULL */
+ size +=
strlen(WMGetDragOperationItemText(WMGetFromArray(operationArray, i))) + 1 /*
NULL */;
}
/* create text list */
diff --git a/WINGs/wsplitview.c b/WINGs/wsplitview.c
index a26ba12..7568a37 100644
--- a/WINGs/wsplitview.c
+++ b/WINGs/wsplitview.c
@@ -649,7 +649,8 @@ void WMAddSplitViewSubview(WMSplitView * sPtr, WMView *
subview)
CHECK_CLASS(sPtr, WC_SplitView);
- if (!(p = (W_SplitViewSubview *) wmalloc(sizeof(W_SplitViewSubview))))
+ p = (W_SplitViewSubview *) wmalloc(sizeof(W_SplitViewSubview));
+ if (!p)
return;
wasMapped = subview->flags.mapped;
diff --git a/configure.ac b/configure.ac
index 35816e9..8378022 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,8 +213,8 @@ dnl Checks for typedefs, structures, and compiler
characteristics.
dnl ==============================================================
AC_DECL_SYS_SIGLIST
AC_C_CONST
-#AC_TYPE_SIZE_T
-#AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_PID_T
AC_TYPE_SIGNAL
@@ -464,7 +464,7 @@ if test "$shape" = yes; then
fi
dnl XRandR support
-dnl =============
+dnl ==============
xrandr=yes
AC_ARG_ENABLE(XRandR, AS_HELP_STRING([--disable-xrandr], [disable XRandR
window extension support]),
xrandr=$enableval, xrandr=yes)
@@ -851,7 +851,7 @@ AC_SUBST(wprefs_bindir)
dnl Enable User Defined Menu thing
-dnl ==================================
+dnl ==============================
AC_ARG_ENABLE(usermenu, AS_HELP_STRING([--enable-usermenu], [user defined
menus for applications]),
if test "$enableval" = yes; then
AC_DEFINE(USER_MENU, 1, [define if you want user defined menus for
applications])
--
1.7.0.4
--
[-]
mkdir /nonexistentFrom 371351d22e85ef286d5eb077d0afbef1da765aa7 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <[email protected]>
Date: Thu, 23 Sep 2010 17:09:46 +0200
Subject: [PATCH] Small assorted formatting changes
Signed-off-by: Tamas TEVESZ <[email protected]>
---
WINGs/dragsource.c | 2 +-
WINGs/wsplitview.c | 3 ++-
configure.ac | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/WINGs/dragsource.c b/WINGs/dragsource.c
index eea0ef5..c1ea68a 100644
--- a/WINGs/dragsource.c
+++ b/WINGs/dragsource.c
@@ -478,7 +478,7 @@ static void registerDescriptionList(WMScreen * scr, WMView * view, WMArray * ope
/* size of XA_STRING info */
for (i = 0; i < count; i++) {
- size += strlen(WMGetDragOperationItemText(WMGetFromArray(operationArray, i))) + 1; /* +1 = +NULL */
+ size += strlen(WMGetDragOperationItemText(WMGetFromArray(operationArray, i))) + 1 /* NULL */;
}
/* create text list */
diff --git a/WINGs/wsplitview.c b/WINGs/wsplitview.c
index a26ba12..7568a37 100644
--- a/WINGs/wsplitview.c
+++ b/WINGs/wsplitview.c
@@ -649,7 +649,8 @@ void WMAddSplitViewSubview(WMSplitView * sPtr, WMView * subview)
CHECK_CLASS(sPtr, WC_SplitView);
- if (!(p = (W_SplitViewSubview *) wmalloc(sizeof(W_SplitViewSubview))))
+ p = (W_SplitViewSubview *) wmalloc(sizeof(W_SplitViewSubview));
+ if (!p)
return;
wasMapped = subview->flags.mapped;
diff --git a/configure.ac b/configure.ac
index 35816e9..8378022 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,8 +213,8 @@ dnl Checks for typedefs, structures, and compiler characteristics.
dnl ==============================================================
AC_DECL_SYS_SIGLIST
AC_C_CONST
-#AC_TYPE_SIZE_T
-#AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_PID_T
AC_TYPE_SIGNAL
@@ -464,7 +464,7 @@ if test "$shape" = yes; then
fi
dnl XRandR support
-dnl =============
+dnl ==============
xrandr=yes
AC_ARG_ENABLE(XRandR, AS_HELP_STRING([--disable-xrandr], [disable XRandR window extension support]),
xrandr=$enableval, xrandr=yes)
@@ -851,7 +851,7 @@ AC_SUBST(wprefs_bindir)
dnl Enable User Defined Menu thing
-dnl ==================================
+dnl ==============================
AC_ARG_ENABLE(usermenu, AS_HELP_STRING([--enable-usermenu], [user defined menus for applications]),
if test "$enableval" = yes; then
AC_DEFINE(USER_MENU, 1, [define if you want user defined menus for applications])
--
1.7.0.4
