Changeset 2299 for libcaca/trunk/examplesTweet

Timestamp:

Apr 19, 2008, 2:42:50 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Remove #include <stdint.h> etc. from "common.h". Instead, make sure that <cucul.h> will provide the C99 types, even if libcaca has been installed.
• Rename what's left of "common.h" to "stubs.h".
• Remove all references to erroneous <inttypes.h> from source files.

Location:

libcaca/trunk/examples

Files:

• Makefile.am (modified) (1 diff)
• blit.c (modified) (1 diff)
• colors.c (modified) (1 diff)
• cucul.c (modified) (1 diff)
• demo.c (modified) (2 diffs)
• dithering.c (modified) (1 diff)
• driver.c (modified) (1 diff)
• event.c (modified) (1 diff)
• export.c (modified) (1 diff)
• figfont.c (modified) (1 diff)
• font.c (modified) (1 diff)
• font2tga.c (modified) (1 diff)
• frames.c (modified) (1 diff)
• fullwidth.c (modified) (1 diff)
• gamma.c (modified) (1 diff)
• hsv.c (modified) (1 diff)
• import.c (modified) (1 diff)
• input.c (modified) (1 diff)
• spritedit.c (modified) (1 diff)
• swallow.c (modified) (1 diff)
• text.c (modified) (1 diff)
• transform.c (modified) (1 diff)
• truecolor.c (modified) (1 diff)
• unicode.c (modified) (1 diff)

libcaca/trunk/examples/Makefile.am

@@ -1 +1 @@
 # $Id$
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul \
+              -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
 
 noinst_PROGRAMS = blit colors cucul demo demo0 dithering driver event export figfont font font2tga frames fullwidth gamma hsv input spritedit swallow text transform truecolor unicode import

libcaca/trunk/examples/blit.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
+
 #if !defined(__KERNEL__)
 #   include <stdio.h>

libcaca/trunk/examples/colors.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)

libcaca/trunk/examples/cucul.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)

libcaca/trunk/examples/demo.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
+
 #if !defined(__KERNEL__)
 #   include <math.h>
@@ -20 +20 @@
 #   include <stdio.h>
 #endif
+
+#include "cucul.h"
 #include "caca.h"
 

libcaca/trunk/examples/dithering.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)

libcaca/trunk/examples/driver.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)

libcaca/trunk/examples/event.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
+
 #if !defined(__KERNEL__)
 #   include <stdio.h>

libcaca/trunk/examples/export.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #   include <stdlib.h>

libcaca/trunk/examples/figfont.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)

libcaca/trunk/examples/font.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
-
 #   if defined(HAVE_ENDIAN_H)
 #      include <endian.h>

libcaca/trunk/examples/font2tga.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #   include <stdlib.h>

libcaca/trunk/examples/frames.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
+
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
-
 #   include <stdio.h>
 #endif
+
 #include "cucul.h"
 #include "caca.h"

libcaca/trunk/examples/fullwidth.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #endif

libcaca/trunk/examples/gamma.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #   include <math.h>

libcaca/trunk/examples/hsv.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #endif

libcaca/trunk/examples/import.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
-
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #   include <stdlib.h>
 #endif
-
 
 #include "cucul.h"

libcaca/trunk/examples/input.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#       include <inttypes.h>
-#   endif
 #   include <string.h>
 #   include <stdio.h>

libcaca/trunk/examples/spritedit.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)

libcaca/trunk/examples/swallow.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
+
 #if !defined(__KERNEL__)
 #   include <stdio.h>

libcaca/trunk/examples/text.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
+
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #   include <string.h>
 #   include <stdlib.h>
 #endif
+
 #include "cucul.h"
 

libcaca/trunk/examples/transform.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
+
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #   include <string.h>

libcaca/trunk/examples/truecolor.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #endif

libcaca/trunk/examples/unicode.c

@@ -14 +14 @@
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #endif