Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h file.c iclass.c settings.c ttfont.c
Log Message:
Fix compile with imlib1 + trivial stuff.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -3 -r1.288 -r1.289
--- E.h 26 Jun 2004 17:49:01 -0000 1.288
+++ E.h 27 Jun 2004 10:42:52 -0000 1.289
@@ -66,19 +66,6 @@
#define ENABLE_TRANSPARENCY 1
#define ENABLE_THEME_TRANSPARENCY 1
-#define ST_UNKNWN 0
-#define ST_BORDER 1
-#define ST_WIDGET 2
-#define ST_ICONBOX 3
-#define ST_MENU 4
-#define ST_MENU_ITEM 5
-#define ST_TOOLTIP 6
-#define ST_DIALOG 7
-#define ST_HILIGHT 8
-#define ST_PAGER 9
-#define ST_WARPLIST 10
-#define ST_BUTTON 11
-
#define ICLASS_ATTR_OPAQUE 0 /* No transparency */
#define ICLASS_ATTR_BG 1 /* Background transparency */
#define ICLASS_ATTR_GLASS 2 /* Glass transparency */
@@ -565,6 +552,19 @@
#define SET_ON 1
#define SET_TOGGLE 2
+#define ST_UNKNWN 0
+#define ST_BORDER 1
+#define ST_WIDGET 2
+#define ST_ICONBOX 3
+#define ST_MENU 4
+#define ST_MENU_ITEM 5
+#define ST_TOOLTIP 6
+#define ST_DIALOG 7
+#define ST_HILIGHT 8
+#define ST_PAGER 9
+#define ST_WARPLIST 10
+#define ST_BUTTON 11
+
/* ISO encodings */
#define ENCOING_ISO_8859_1 0
#define ENCOING_ISO_8859_2 1
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/file.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- file.c 21 Mar 2004 01:39:40 -0000 1.60
+++ file.c 27 Jun 2004 10:42:52 -0000 1.61
@@ -584,7 +584,6 @@
word(const char *s, int num, char *wd)
{
int cnt, i;
- char *w;
const char *start, *finish, *ss;
EDBUG(9, "word");
@@ -602,7 +601,6 @@
start = NULL;
finish = NULL;
ss = NULL;
- w = wd;
while (s[i])
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iclass.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- iclass.c 26 Jun 2004 17:49:01 -0000 1.42
+++ iclass.c 27 Jun 2004 10:42:53 -0000 1.43
@@ -387,7 +387,7 @@
static void
ImageStateMakePmapMask(ImageState * is, Drawable win, PmapMask * pmm,
- int make_mask, int w, int h, int image_type __UNUSED__)
+ int make_mask, int w, int h, int image_type)
{
int apply, trans;
int ww, hh;
@@ -667,6 +667,9 @@
imlib_context_set_image(ii);
imlib_free_image();
}
+#else
+ make_mask = 0;
+ image_type = 0;
#endif
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- settings.c 19 Jun 2004 11:17:08 -0000 1.112
+++ settings.c 27 Jun 2004 10:42:53 -0000 1.113
@@ -2443,11 +2443,14 @@
static char tmp_userbg;
static int tmp_bg_timeout;
static int tmp_theme_transparency;
+
+#ifdef ENABLE_THEME_TRANSPARENCY
static int tmp_st_border;
static int tmp_st_widget;
static int tmp_st_menu;
static int tmp_st_tooltip;
static int tmp_st_hilight;
+#endif
static void BG_RedrawView(char nuke_old);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ttfont.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- ttfont.c 26 Jun 2004 20:27:31 -0000 1.37
+++ ttfont.c 27 Jun 2004 10:42:53 -0000 1.38
@@ -138,6 +138,8 @@
#else
#include <freetype.h>
#endif
+#include <sys/ipc.h>
+#include <sys/shm.h>
struct _efont
{
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
