OSSP CVS Repository

ossp - Difference in ossp-pkg/str/str_pcre.h versions 1.2 and 1.3
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/str/str_pcre.h 1.2 -> 1.3

--- str_pcre.h   2001/08/16 12:04:25     1.2
+++ str_pcre.h   2001/12/27 12:24:20     1.3
@@ -1,6 +1,16 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
+/*
+ *  Perl Compatible Regular Expression (PCRE) Library
+ *  Copyright (c) 1997-2001 Philip Hazel <ph10@cam.ac.uk>
+ *  Copyright (c) 1997-2001 University of Cambridge
+ *
+ *  DO NOT EDIT THIS FILE, IT WAS AUTOMATICALLY GENERATED!
+ *
+ *  This is an automatically generated, extremely stripped down
+ *  version of the PCRE 3.8 library from the Philip Hazel.
+ *  This version is still distributed under the same original PCRE
+ *  Open Source license, but Philip Hazel is no longer responsible
+ *  for this version.
+ */
 
 /*
 This is a library of functions to support regular expressions whose syntax
@@ -35,26 +45,42 @@
 #ifndef __STR_PCRE_H__
 #define __STR_PCRE_H__
 
-/* The file pcre.h is build by "configure". Do not edit it; instead
-make changes to pcre.in. */
+#define PCRE_PREFIX str_
 
 #define PCRE_MAJOR          3
-#define PCRE_MINOR          5
-#define PCRE_DATE           15-Aug-2001
+#define PCRE_MINOR          8
+#define PCRE_DATE           18-Dec-2001
 
-/* Have to include stdlib.h in order to ensure that size_t is defined;
-it is needed here for malloc. */
+#ifdef PCRE_PREFIX
+#if defined(__STDC__) || defined(__cplusplus)
+#define __PCRE_CONCAT(x,y) x ## y
+#define PCRE_CONCAT(x,y) __PCRE_CONCAT(x,y)
+#else
+#define __PCRE_CONCAT(x) x
+#define PCRE_CONCAT(x,y) __PCRE_CONCAT(x)y
+#endif
+#define pcre_malloc PCRE_CONCAT(PCRE_PREFIX,pcre_malloc)
+#define pcre_free PCRE_CONCAT(PCRE_PREFIX,pcre_free)
+#define pcre_compile PCRE_CONCAT(PCRE_PREFIX,pcre_compile)
+#define pcre_copy_substring PCRE_CONCAT(PCRE_PREFIX,pcre_copy_substring)
+#define pcre_exec PCRE_CONCAT(PCRE_PREFIX,pcre_exec)
+#define pcre_free_substring PCRE_CONCAT(PCRE_PREFIX,pcre_free_substring)
+#define pcre_free_substring_list PCRE_CONCAT(PCRE_PREFIX,pcre_free_substring_list)
+#define pcre_get_substring PCRE_CONCAT(PCRE_PREFIX,pcre_get_substring)
+#define pcre_get_substring_list PCRE_CONCAT(PCRE_PREFIX,pcre_get_substring_list)
+#define pcre_info PCRE_CONCAT(PCRE_PREFIX,pcre_info)
+#define pcre_fullinfo PCRE_CONCAT(PCRE_PREFIX,pcre_fullinfo)
+#define pcre_maketables PCRE_CONCAT(PCRE_PREFIX,pcre_maketables)
+#define pcre_study PCRE_CONCAT(PCRE_PREFIX,pcre_study)
+#define pcre_version PCRE_CONCAT(PCRE_PREFIX,pcre_version)
+#endif
 
 #include <stdlib.h>
 
-/* Allow for C++ users */
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* Options */
-
 #define PCRE_CASELESS        0x0001
 #define PCRE_MULTILINE       0x0002
 #define PCRE_DOTALL          0x0004
@@ -68,8 +94,6 @@
 #define PCRE_NOTEMPTY        0x0400
 #define PCRE_UTF8            0x0800
 
-/* Exec-time and get-time error codes */
-
 #define PCRE_ERROR_NOMATCH        (-1)
 #define PCRE_ERROR_NULL           (-2)
 #define PCRE_ERROR_BADOPTION      (-3)
@@ -78,8 +102,6 @@
 #define PCRE_ERROR_NOMEMORY       (-6)
 #define PCRE_ERROR_NOSUBSTRING    (-7)
 
-/* Request types for pcre_fullinfo() */
-
 #define PCRE_INFO_OPTIONS         0
 #define PCRE_INFO_SIZE            1
 #define PCRE_INFO_CAPTURECOUNT    2
@@ -88,23 +110,15 @@
 #define PCRE_INFO_FIRSTTABLE      5
 #define PCRE_INFO_LASTLITERAL     6
 
-/* Types */
-
-struct real_pcre;        /* declaration; the definition is private  */
-struct real_pcre_extra;  /* declaration; the definition is private */
-
-typedef struct real_pcre pcre;
-typedef struct real_pcre_extra pcre_extra;
+struct pcre_st;
+struct pcre_extra_st;
 
-/* Store get and free functions. These can be set to alternative malloc/free
-functions if required. Some magic is required for Win32 DLL; it is null on
-other OS. */
+typedef struct pcre_st pcre;
+typedef struct pcre_extra_st pcre_extra;
 
 extern void *(*pcre_malloc)(size_t);
 extern void  (*pcre_free)(void *);
 
-/* Functions */
-
 extern pcre *pcre_compile(const char *, int, const char **, int *,
               const unsigned char *);
 extern int  pcre_copy_substring(const char *, int *, int, int, char *, int);
@@ -121,7 +135,7 @@
 extern const char *pcre_version(void);
 
 #ifdef __cplusplus
-}  /* extern "C" */
+}
 #endif
 
-#endif /* __STR_PCRE_H__ */
+#endif

CVSTrac 2.0.1