]> git.saurik.com Git - wxWidgets.git/commitdiff
fixed #include paths to use local copies of png/gdk_imlib/zlib headers
authorKarsten Ballüder <ballueder@usa.net>
Mon, 22 Jun 1998 12:47:56 +0000 (12:47 +0000)
committerKarsten Ballüder <ballueder@usa.net>
Mon, 22 Jun 1998 12:47:56 +0000 (12:47 +0000)
fixed compiler warning in time.cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

42 files changed:
src/common/time.cpp
src/gdk_imlib/cache.c
src/gdk_imlib/colors.c
src/gdk_imlib/gdk_imlib.h
src/gdk_imlib/globals.c
src/gdk_imlib/load.c
src/gdk_imlib/misc.c
src/gdk_imlib/rend.c
src/gdk_imlib/save.c
src/gdk_imlib/utils.c
src/gtk/app.cpp
src/gtk/bitmap.cpp
src/gtk/colour.cpp
src/gtk1/app.cpp
src/gtk1/bitmap.cpp
src/gtk1/colour.cpp
src/png/example.c
src/png/png.c
src/png/png.h
src/png/pngerror.c
src/png/pngget.c
src/png/pngmem.c
src/png/pngpread.c
src/png/pngread.c
src/png/pngrio.c
src/png/pngrtran.c
src/png/pngrutil.c
src/png/pngset.c
src/png/pngtest.c
src/png/pngtrans.c
src/png/pngwio.c
src/png/pngwrite.c
src/png/pngwtran.c
src/png/pngwutil.c
src/zlib/adler32.c
src/zlib/compress.c
src/zlib/crc32.c
src/zlib/example.c
src/zlib/minigzip.c
src/zlib/uncompr.c
src/zlib/zlib.h
src/zlib/zutil.h

index 852de830413ea15ac68943302f31062ac561eafd..15936ad32376b275c7ebdea4d34333f885de7e20 100644 (file)
@@ -99,7 +99,7 @@ wxTime::wxTime()
         wxTimeInitialized = TRUE;
   }
   sec = wxGetCurrentTime();
-  sec += 2177452800L;     /* seconds from 1/1/01 to 1/1/70 */
+  sec += 2177452800UL;     /* seconds from 1/1/01 to 1/1/70 */
 }
 
 wxTime::wxTime(hourTy h, minuteTy m, secondTy s, bool dst)
index 4e750df20cc292e0310c9e53a36f2af2f43abd13..561097404d132e779c9a54053d141dfd5e6b4599 100644 (file)
@@ -1,6 +1,6 @@
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 /* uncomment this to compile imlib's cahce with pixmap accounting output */
 /*#define PIXMAP_ACCOUNTING */
index b27207c6004c2182827131034c50ab9d9b6428ff..768440dc8fbc8e3e9757853af068928656896b66 100644 (file)
@@ -1,6 +1,6 @@
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 void
 g_PaletteAlloc(int num, int *cols)
index 5af1cd580eb51df05f78d9a8dcce2000b61ec8c1..f8baeaa291e0e2e415f8cc13388c0e8d5cf863c5 100644 (file)
@@ -2,7 +2,9 @@
 #ifndef __GDK_IMLIB_H__
 #define __GDK_IMLIB_H__
 
-#include <gdk_imlib_types.h>
+// we need this funny include path, because the working directory when
+// including this might actually be ../gdk/ instead of .
+#include "../gdk_imlib/gdk_imlib_types.h"
 
 #ifdef __cplusplus
 extern              "C"
index d92b993247bd96e337e7ea17291e77c5fbd312a7..ab506d6815dd1a92ded72202f10375888e2475cb 100644 (file)
@@ -1,6 +1,6 @@
 
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 ImlibData          *id;
index e37495f74309a6a7cfb76bc5c419b2d8528edd3f..6be12ea80ac717e8e342759a4b7252bfdbc3b7da 100644 (file)
@@ -1,9 +1,9 @@
 
 #define _GNU_SOURCE
-#include <config.h>
+#include "../gdk_imlib/config.h"
 
-#include "gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 /*      Split the ID - damages input    */
 
index e5fe0250371011e7918c814845c6ea249b285338..92939bf56c515c813e2bf41086cb57d7ae181ac0 100644 (file)
@@ -1,6 +1,6 @@
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 gint
 gdk_imlib_get_render_type()
index 7cdabc01b47fd97424569fc51712c56e0fe0ec66..5b77e1f5b1670ea9a9d2b239a0c575c0baa6699b 100644 (file)
@@ -1,6 +1,6 @@
 #define _GNU_SOURCE
-#include "gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 GdkPixmap          *
 gdk_imlib_pixmap_foreign_new(gint width, gint height,
index 7b16007b4db238150ee34cbc218ae366af09aed0..5f009b22c7d1ebaadb67b9032ad11f645059e487 100644 (file)
@@ -1,8 +1,8 @@
 #define _GNU_SOURCE
-#include <config.h>
+#include "../gdk_imlib/config.h"
 
-#include "gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 gint
 gdk_imlib_save_image(GdkImlibImage * im, char *file, GdkImlibSaveInfo * info)
index 961ec908f4ae8af717fb58bf98b473441473de5b..2f0510e7b9fa6514e2353ebf0eefe4819425fe4e 100644 (file)
@@ -1,7 +1,7 @@
 #define _GNU_SOURCE
 
-#include "gdk_imlib.h"
-#include "gdk_imlib_private.h"
+#include "../gdk_imlib/gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib_private.h"
 
 void
 gcalc_map_tables(GdkImlibImage * im)
index ee5c02afca1e76c04e5a3fba0bcc22991ae57388..9cfd6f22531a2c43a37cbef946dbd0a42a588713 100644 (file)
@@ -22,7 +22,7 @@
 #include "unistd.h"
 
 #ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 //-----------------------------------------------------------------------------
index 6c2ecbe6d40acd140cd67a6f7641f3578354c24b..845a1fcf0002c5bdda91a2f09cc1d10cb3b6130a 100644 (file)
@@ -16,7 +16,7 @@
 #include "gdk/gdkprivate.h"
 
 #ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 //-----------------------------------------------------------------------------
index ba970a79ba5323139b32ea9dbd9fd6599a394cd4..b0efc2dcc218dc362d095a9bafea47659c5a773c 100644 (file)
@@ -16,7 +16,7 @@
 #include "wx/gdicmn.h"
 
 #ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 //-----------------------------------------------------------------------------
index ee5c02afca1e76c04e5a3fba0bcc22991ae57388..9cfd6f22531a2c43a37cbef946dbd0a42a588713 100644 (file)
@@ -22,7 +22,7 @@
 #include "unistd.h"
 
 #ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 //-----------------------------------------------------------------------------
index 6c2ecbe6d40acd140cd67a6f7641f3578354c24b..845a1fcf0002c5bdda91a2f09cc1d10cb3b6130a 100644 (file)
@@ -16,7 +16,7 @@
 #include "gdk/gdkprivate.h"
 
 #ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 //-----------------------------------------------------------------------------
index ba970a79ba5323139b32ea9dbd9fd6599a394cd4..b0efc2dcc218dc362d095a9bafea47659c5a773c 100644 (file)
@@ -16,7 +16,7 @@
 #include "wx/gdicmn.h"
 
 #ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
+#include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 //-----------------------------------------------------------------------------
index bc86aed6ea483d437e88a588146c71edc3fab326..4b22852ee2e628f077aea79fd1f6301171b2bcdb 100644 (file)
@@ -13,7 +13,7 @@
  * working PNG reader/writer, see pngtest.c, included in this distribution.
  */
 
-#include "png.h"
+#include "../png/png.h"
 
 /* Check to see if a file is a PNG file using png_sig_cmp().  Returns
  * non-zero if the image is a PNG, and 0 if it isn't a PNG.
index 127b47b68ff6c7e4f13d5277a8f74e5698537b16..33009674d61f42f809e07e1ff6a982ecc992d137 100644 (file)
@@ -11,7 +11,7 @@
 
 #define PNG_INTERNAL
 #define PNG_NO_EXTERN
-#include "png.h"
+#include "../png/png.h"
 
 /* Version information for C files.  This had better match the version
  * string defined in png.h.
index 36541e916ee5c66cd99b5be789818540186fa0b4..3c5ad6007ebde9006ec92489a510d12de6972847 100644 (file)
@@ -106,10 +106,10 @@ extern "C" {
  */
 
 /* include the compression library's header */
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 /* include all user configurable info */
-#include "pngconf.h"
+#include "../png/pngconf.h"
 
 /* This file is arranged in several sections.  The first section contains
  * structure and type definitions.  The second section contains the external
index 9bf58a4a5cf64f32e75e0c52b9931f9634e125bf..c31201bdf4ebedb49c85714b99d5065185848d06 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 static void png_default_error PNGARG((png_structp png_ptr,
                                       png_const_charp message));
index eb2f64fade15b5154410c9ef7da40b5cd7a5f62b..f45fa418aa3a0841f557dc8925eb66132e2d5a65 100644 (file)
@@ -10,7 +10,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 png_uint_32
 png_get_valid(png_structp png_ptr, png_infop info_ptr, png_uint_32 flag)
index 2fa3627dc4cafa0ed2f6a3d3139d654641bdc319..b92fcc8ae08ac4f583d684533eaef576981d4249 100644 (file)
@@ -14,7 +14,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 /* The following "hides" PNG_MALLOC and PNG_FREE thus allowing the pngtest
    application to put a wrapper on top of them. */
index 0f0d466fa23822dedaf9a27cbc3bfdcd9b60a2d8..897140d9dc63fd8d70a605c5f11c914aca35ab8b 100644 (file)
@@ -10,7 +10,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
 
index 1618b73095b67919b2d0e19d9fa2defa721d908b..714f5f14299cf459d6cc80a3e52cca0d52c2f7bb 100644 (file)
@@ -13,7 +13,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 /* Create a PNG structure for reading, and allocate any memory needed. */
 png_structp
index 7adb48f54c940c70beb3346acdc9e512e32ea122..6c6710a46f660cafe98d34960605e8f01acac244 100644 (file)
@@ -17,7 +17,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 /* Read the data from whatever input you are using.  The default routine
    reads from a file pointer.  Note that this routine sometimes gets called
index 885af53905a58308ca3e67142a3255f833992320..684bf5f2537d0374629bd23877b66387513f2779 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
 /* With these routines, we avoid an integer divide, which will be slower on
index 1c379069391ec763fbfb214db0dd90125004564c..e127c87995bc8da6699f36cc54500e4a505b1911 100644 (file)
@@ -13,7 +13,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 #ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
 /* Grab an unsigned 32-bit integer from a buffer in big endian format. */
index aa85f24b6f9adcf1b4cffc45ad3403c3fdcfc161..cb3fbe27b6d507646615419ac3bc1128f3c2debd 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 #if defined(PNG_READ_bKGD_SUPPORTED) || defined(PNG_WRITE_bKGD_SUPPORTED)
 void
index 22cbcb3ea2aa44e1e6503d33ccf8b6fa3d30e5b8..9eae4795ea910e7d0d1960535ea6adad1f5ebd01 100644 (file)
@@ -35,7 +35,7 @@
 #define PNG_DEBUG 0
 #endif
 
-#include "png.h"
+#include "../png/png.h"
 
 int test_one_file PNGARG((PNG_CONST char *inname, PNG_CONST char *outname));
 
index d38dbd19deb1632ec8839a60e78928bbff511758..b28464acb264593caae8bf72aa816143e79afa93 100644 (file)
@@ -10,7 +10,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
 /* turn on bgr to rgb mapping */
index 444a123b58c13a8ab96cd60e38c8bfdea36521af..69825046917a684b23cfa9cef54e4834482586c4 100644 (file)
@@ -17,7 +17,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 /* Write the data to whatever output you are using.  The default routine
    writes to a file pointer.  Note that this routine sometimes gets called
index 9980027e309e53319b8507124fa856bc1b8e1ebe..699207c04a8596485fc17a743af019fe3504bc1f 100644 (file)
@@ -11,7 +11,7 @@
 
 /* get internal access to png.h */
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 /* Writes all the PNG information.  This is the suggested way to use the
  * library.  If you have a new chunk to add, make a function to write it,
index d85e01536e43c040f0b1f928684e245d2678659c..df224c88eebc6fcd66108d0ce3ff9a3a52be72a6 100644 (file)
@@ -10,7 +10,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 /* Transform the data according to the users wishes.  The order of
  * transformations is significant.
index 492bde7bb0520e78c7182f6a237778a7184f4b23..c6ae1a677e46a739ece9afea05af22bb753d9f5d 100644 (file)
@@ -10,7 +10,7 @@
  */
 
 #define PNG_INTERNAL
-#include "png.h"
+#include "../png/png.h"
 
 /* Place a 32-bit number into a buffer in PNG byte order.  We work
  * with unsigned numbers for convenience, although one supported
index 16cf9a703f7cdedc6715db64715254780ad6414d..ef4b2ebdc88bbb207b6b1e55e34333af3f22b606 100644 (file)
@@ -5,7 +5,7 @@
 
 /* @(#) $Id$ */
 
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 #define BASE 65521L /* largest prime smaller than 65536 */
 #define NMAX 5552
index 1cee470913d75a3fa74c998c5638920fc382ec07..51761b105e2f2d3c6962f8034d37c47c8390c8a0 100644 (file)
@@ -5,7 +5,7 @@
 
 /* @(#) $Id$ */
 
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 /* ===========================================================================
      Compresses the source buffer into the destination buffer. The level
index a91101a81c6ae58913d5f3266e8da4ff75eda936..52d9cb1f44893e7591dad1fab8e19a0b32cdae4c 100644 (file)
@@ -5,7 +5,7 @@
 
 /* @(#) $Id$ */
 
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 #define local static
 
index 073ce76b3300d3a209fd3bedcbace737f4a0d312..a9e6486cc065bb40129130edcfe5b2e6546d963a 100644 (file)
@@ -6,7 +6,7 @@
 /* @(#) $Id$ */
 
 #include <stdio.h>
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 #ifdef STDC
 #  include <string.h>
index c05d0ea92fb50206f161fa3b6eb01a3a395af40f..05d0197caa42975f4b50a30b2173d94459dca7f1 100644 (file)
@@ -16,7 +16,7 @@
 /* @(#) $Id$ */
 
 #include <stdio.h>
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 #ifdef STDC
 #  include <string.h>
index d1033213781eecf2dbd78f088b03845c5c13c085..f4d287b51842b6b53ec7eab432bc0bd56837ab92 100644 (file)
@@ -5,7 +5,7 @@
 
 /* @(#) $Id$ */
 
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 /* ===========================================================================
      Decompresses the source buffer into the destination buffer.  sourceLen is
index 787b5fd92ae7319091cfacc566ed8b7f404c4530..76775e792240606950d02a9ba0d5de0c30422833 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef _ZLIB_H
 #define _ZLIB_H
 
-#include "zconf.h"
+#include "../zlib/zconf.h"
 
 #ifdef __cplusplus
 extern "C" {
index 5e403d1d78985f1348514fc7b82588e10db08d0a..5a832dd7dd3aa143a65dab505b5df1af944a97df 100644 (file)
@@ -13,7 +13,7 @@
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
 
-#include "zlib.h"
+#include "../zlib/zlib.h"
 
 #ifdef STDC
 #  include <stddef.h>