Shorter typedefs

6 files changed, 12 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 6a9da5c..c49d2ee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 all: sxiv
 
-VERSION=git-20110227
+VERSION=git-20110301
 
 CC?=gcc
 PREFIX?=/usr/local
diff --git a/image.h b/image.h
index 8c6beec..2a9e218 100644
--- a/image.h
+++ b/image.h
@@ -23,20 +23,20 @@
 
 #include "window.h"
 
-typedef enum scalemode_e {
+typedef enum {
 	SCALE_DOWN = 0,
 	SCALE_FIT,
 	SCALE_ZOOM
 } scalemode_t;
 
-typedef enum pandir_e {
+typedef enum {
 	PAN_LEFT = 0,
 	PAN_RIGHT,
 	PAN_UP,
 	PAN_DOWN
 } pandir_t;
 
-typedef struct img_s {
+typedef struct {
 	Imlib_Image *im;
 
 	float zoom;
diff --git a/main.c b/main.c
index d240128..ec803f6 100644
--- a/main.c
+++ b/main.c
@@ -34,7 +34,7 @@
 #include "util.h"
 #include "window.h"
 
-typedef enum appmode_e {
+typedef enum {
 	MODE_NORMAL = 0,
 	MODE_THUMBS
 } appmode_t;
diff --git a/options.h b/options.h
index 246ddb7..4ce9637 100644
--- a/options.h
+++ b/options.h
@@ -21,7 +21,7 @@
 
 #include "image.h"
 
-typedef struct options_s {
+typedef struct {
 	const char **filenames;
 	int filecnt;
 	unsigned char from_stdin;
diff --git a/thumbs.h b/thumbs.h
index 0e3650e..af9c239 100644
--- a/thumbs.h
+++ b/thumbs.h
@@ -21,14 +21,14 @@
 
 #include "window.h"
 
-typedef enum tnsdir_e {
+typedef enum {
 	TNS_LEFT = 0,
 	TNS_RIGHT,
 	TNS_UP,
 	TNS_DOWN
 } tnsdir_t;
 
-typedef struct thumb_s {
+typedef struct {
 	Pixmap pm;
 	int x;
 	int y;
@@ -36,7 +36,7 @@ typedef struct thumb_s {
 	int h;
 } thumb_t;
 
-typedef struct tns_s {
+typedef struct {
 	thumb_t *thumbs;
 	int cap;
 	int cnt;
diff --git a/window.h b/window.h
index 01fa90c..87f3a0f 100644
--- a/window.h
+++ b/window.h
@@ -23,14 +23,14 @@
 
 #define CLEANMASK(mask) ((mask) & ~LockMask)
 
-typedef enum win_cur_e {
+typedef enum {
 	CURSOR_ARROW = 0,
 	CURSOR_NONE,
 	CURSOR_HAND,
 	CURSOR_WATCH
 } win_cur_t;
 
-typedef struct win_env_s {
+typedef struct {
 	Display *dpy;
 	int scr;
 	int scrw, scrh;
@@ -39,7 +39,7 @@ typedef struct win_env_s {
 	int depth;
 } win_env_t;
 
-typedef struct win_s {
+typedef struct {
 	Window xwin;
 	win_env_t env;