Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h util.h
Log Message:
Move config options to config.h.
===================================================================
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.617
retrieving revision 1.618
diff -u -3 -r1.617 -r1.618
--- E.h 28 Jun 2008 19:08:34 -0000 1.617
+++ E.h 7 Aug 2008 23:14:54 -0000 1.618
@@ -24,9 +24,6 @@
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
#include "config.h"
#include "alert.h"
@@ -35,56 +32,16 @@
#include "sound.h"
#include "util.h"
-#define USE_EXT_INIT_WIN 1
-
#include <X11/X.h>
-#ifdef HAVE_SM
-#define USE_SM 1
-#endif
-
-#ifdef HAVE_XSYNC
-#define USE_XSYNC 1
-#endif
-
-#ifdef HAVE_XSCREENSAVER
-#define USE_XSCREENSAVER 1 /* Experimental */
-#endif
-
-#ifdef HAVE_XRANDR
-#ifdef HAVE_X11_EXTENSIONS_XRANDR_H
-#define USE_XRANDR 1
-#endif
-#endif
-
-#ifdef HAVE_COMPOSITE
-#define USE_COMPOSITE 1
-#endif
-
-#ifdef HAVE_GLX
-#define USE_GLX 1
-#endif
-
#include "xtypes.h"
-#define ENABLE_DESKRAY 0 /* Not functional */
-
-#define ENABLE_TRANSPARENCY 1
-#define ENABLE_THEME_TRANSPARENCY 1
-
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
-
-#ifndef HAVE_STRCASESTR
-# define strcasestr(haystack, needle) strstr(haystack, needle)
-#endif
-#ifndef HAVE_STRCASECMP
-# define strcasecmp(s1, s2) strcmp(s1, s2)
-#endif
#define FILEPATH_LEN_MAX 4096
===================================================================
RCS file: /cvs/e/e16/e/src/util.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- util.h 24 May 2008 18:13:17 -0000 1.17
+++ util.h 7 Aug 2008 23:14:54 -0000 1.18
@@ -25,7 +25,11 @@
#define _UTIL_H_
#include "config.h"
+
#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#define INT2PTR(i) ((void*)(long)(i))
#define PTR2INT(p) ((int)(long)(p))
@@ -55,8 +59,14 @@
#define USE_LIBC_STRNDUP 1 /* Use libc strndup if present */
#endif
+#ifndef HAVE_STRCASESTR
+#define strcasestr(haystack, needle) strstr(haystack, needle)
+#endif
+#ifndef HAVE_STRCASECMP
+#define strcasecmp(s1, s2) strcmp(s1, s2)
+#endif
+
/* memory.c */
-#include <stdlib.h>
#define Ecalloc calloc
#define Emalloc malloc
#define Erealloc realloc
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
