Removed custom typedef

diff --git a/src/dockapp.h b/src/dockapp.h
index 32c44ae..65cbb6e 100644 (file)
--- a/src/dockapp.h
+++ b/src/dockapp.h
@@ -23,14 +23,14 @@
 
 #include <X11/xpm.h>
 
 
 #include <X11/xpm.h>
 

-typedef struct XpmIcon
+struct XpmIcon

 {
   XpmAttributes attributes;
   Pixmap shapemask;
   Pixmap image;
 {
   XpmAttributes attributes;
   Pixmap shapemask;
   Pixmap image;

-} XpmIcon;
+};

 
 

-typedef struct dockapp_t
+struct dockapp_t

 {
   Display *display;
   Window  root_win;
 {
   Display *display;
   Window  root_win;


@@ -41,8 +41,8 @@ typedef struct dockapp_t
   Window  iconwin;
   Window  win;
   GC      NormalGC;
   Window  iconwin;
   Window  win;
   GC      NormalGC;

-  XpmIcon xpm_icon;
-} dockapp_t;
+  struct XpmIcon xpm_icon;
+};

 
 void
 InitDockAppWindow( int argc, char *argv[], char *pixmap_data[],
 
 void
 InitDockAppWindow( int argc, char *argv[], char *pixmap_data[],


@@ -62,6 +62,6 @@ copyXPMArea( int x, int y, unsigned int sx, unsigned int sy, int dx, int dy );
 #define _SCOPE_ extern
 #endif
 
 #define _SCOPE_ extern
 #endif
 

-_SCOPE_ dockapp_t dockapp;
+_SCOPE_ struct dockapp_t dockapp;

 
 #endif /* DOCKAPP_H */
 
 #endif /* DOCKAPP_H */

diff --git a/src/ssl.h b/src/ssl.h
index e9552a7..b692b2f 100644 (file)
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -40,12 +40,12 @@
 
 #define FAIL    -1
 
 
 #define FAIL    -1
 

-typedef struct ssl_infos_t {
+struct ssl_infos_t {

   SSL_CTX *ctx;
   SSL *ssl;
   SSL_CTX *ctx;
   SSL *ssl;

-} ssl_infos_t;
+};

 
 

-_SCOPE_ ssl_infos_t ssl_infos;
+_SCOPE_ struct ssl_infos_t ssl_infos;

 
 SSL_CTX *
 InitCTX( void );
 
 SSL_CTX *
 InitCTX( void );

diff --git a/src/wmnotify.h b/src/wmnotify.h
index ab19d16..0588e97 100644 (file)
--- a/src/wmnotify.h
+++ b/src/wmnotify.h
@@ -60,7 +60,7 @@
 
 #define MAX_STR_LEN 256
 
 
 #define MAX_STR_LEN 256
 

-typedef struct wmnotify_t
+struct wmnotify_t

 {
   bool debug;
   char *display_arg;
 {
   bool debug;
   char *display_arg;


@@ -80,7 +80,7 @@ typedef struct wmnotify_t
   char username[MAX_STR_LEN];
   char password[MAX_STR_LEN];
   int sock_fd;
   char username[MAX_STR_LEN];
   char password[MAX_STR_LEN];
   int sock_fd;

-} wmnotify_t;
+};

 
 /* Exported variables */
 #undef _SCOPE_
 
 /* Exported variables */
 #undef _SCOPE_


@@ -90,6 +90,6 @@ typedef struct wmnotify_t
 #  define _SCOPE_ extern
 #endif
 
 #  define _SCOPE_ extern
 #endif
 

-_SCOPE_ wmnotify_t wmnotify_infos;
+_SCOPE_ struct wmnotify_t wmnotify_infos;

 
 #endif /* WMNOTIFY_H */
 
 #endif /* WMNOTIFY_H */